市场导入

modules/report/src/main/java/com/jeesite/modules/report/web/ResearchReportController.java

@@ -17,6 +17,10 @@ import com.jeesite.modules.report.entity.ResearchReport;
 import com.jeesite.modules.report.service.ResearchReportService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.dom4j.DocumentException;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -56,6 +60,8 @@ public class ResearchReportController extends BaseController {
 	@Value("${file.baseDir}")
 	private String basePath;
 	private static final String TEMP_PATH = "/temp";
+	private static final String marketZH = "市场概况";
+	private static final String marketEN = "Market Overview";
 
 	/**
 	 * 获取数据
@@ -269,20 +275,9 @@ public class ResearchReportController extends BaseController {
 			StringBuffer sb = new StringBuffer();
 			sb.append(vo.getTitle());	//标题
 			sb.append("\r\r");
+			sb.append(convertMarket(vo.getMarketScale(), vo.getMarketDriven(), vo.getLang()));
+			sb.append("\r\r");
 			sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
-			if (StringUtils.isNotEmpty(vo.getMarketScale()) || StringUtils.isNotEmpty(vo.getMarketDriven())) {
-				sb.append("\r\r");
-			}
-			if (StringUtils.isNotEmpty(vo.getMarketScale())) {
-				sb.append("\r\r");
-				sb.append(Html2PlainTxtUtils.convert(vo.getMarketScale()));
-				sb.append("\r\r");
-			}
-			if (StringUtils.isNotEmpty(vo.getMarketDriven())) {
-				sb.append("\r\r");
-				sb.append(Html2PlainTxtUtils.convert(vo.getMarketDriven()));
-				sb.append("\r\r");
-			}
 			sb.append("\r\r");
 			sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
 			sb.append("\r\r");
@@ -348,16 +343,7 @@ public class ResearchReportController extends BaseController {
 		String lineStr = System.lineSeparator();
 		if(!list.isEmpty()){
 			listExcel = list.stream().map(vo -> {
-				vo.setReportScopeHtml(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));
-				if (StringUtils.isNotEmpty(vo.getMarketScale()) || StringUtils.isNotEmpty(vo.getMarketDriven())) {
-					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr);
-				}
-				if (StringUtils.isNotEmpty(vo.getMarketScale())) {
-					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getMarketScale()) + lineStr + lineStr);
-				}
-				if (StringUtils.isNotEmpty(vo.getMarketDriven())) {
-					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getMarketDriven()) + lineStr + lineStr);
-				}
+				vo.setReportScopeHtml(convertMarket(vo.getMarketScale(), vo.getMarketDriven(), vo.getLang()) + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));
 				vo.setDirectoryHtml(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));
 				return vo;
 			}).collect(Collectors.toList());
@@ -390,20 +376,9 @@ public class ResearchReportController extends BaseController {
 				StringBuffer sb = new StringBuffer();
 				sb.append(vo.getTitle());	//标题
 				sb.append("\r\r");
+				sb.append(convertMarket(vo.getMarketScale(), vo.getMarketDriven(), vo.getLang()));
+				sb.append("\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
-				if (StringUtils.isNotEmpty(vo.getMarketScale()) || StringUtils.isNotEmpty(vo.getMarketDriven())) {
-					sb.append("\r\r");
-				}
-				if (StringUtils.isNotEmpty(vo.getMarketScale())) {
-					sb.append("\r\r");
-					sb.append(Html2PlainTxtUtils.convert(vo.getMarketScale()));
-					sb.append("\r\r");
-				}
-				if (StringUtils.isNotEmpty(vo.getMarketDriven())) {
-					sb.append("\r\r");
-					sb.append(Html2PlainTxtUtils.convert(vo.getMarketDriven()));
-					sb.append("\r\r");
-				}
 				sb.append("\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
 				sb.append("\r\r");
@@ -452,4 +427,28 @@ public class ResearchReportController extends BaseController {
 		}
 	}
 
+	private String convertMarket(String marketScale, String marketDriven, String lang) {
+		if (StringUtils.isEmpty(marketScale) && StringUtils.isEmpty(marketDriven)) {
+			return "";
+		}
+		StringBuffer sb = new StringBuffer();
+		if (Constants.lang.ZH_CH.equals(lang)) {
+			sb.append(marketZH);
+		} else {
+			sb.append(marketEN);
+		}
+		sb.append("\\n");
+		if (StringUtils.isNotEmpty(marketScale)) {
+			sb.append("\\n");
+			sb.append(Html2PlainTxtUtils.convert(marketScale));
+			sb.append("\\n");
+		}
+		if (StringUtils.isNotEmpty(marketDriven)) {
+			sb.append("\\n");
+			sb.append(Html2PlainTxtUtils.convert(marketDriven));
+			sb.append("\\n");
+		}
+		sb.append("\\n\\n");
+		return Html2PlainTxtUtils.convert(sb.toString());
+	}
 }