From 1a0c6e1ad6098d527bb49d9071fb96854e67d8dd Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 23 Aug 2022 14:06:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93=E6=8F=92=E5=85=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=82=E7=A7=81?=
 =?UTF-8?q?=E5=AF=86=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B9=9F=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProblemKnowledgeBaseEOServiceImpl.java    | 59 +++++++++++++++----
 1 file changed, 46 insertions(+), 13 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index acb14a326..aeeb5b137 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -90,8 +90,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			this.batchInsertProblemKnowledgeBaseUserEO(problemKnowledgeBaseEO);
 		}else {
         	//如果展示权限是公开，则把该数据插入到搜索中心中。
-			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+			//this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
 		}
+		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
     }
 
 	/**
@@ -142,11 +143,14 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			}
 		}
 
+		//获取所有市场
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+
 		//sbCn sbEn 这两个字段作为es中英文切换
 		StringBuilder sbCn = new StringBuilder();
-		esFullText(problemKnowledgeBaseEO,sbCn,null,CutEnum.CN.getValue(),fileTextSb.toString());
+		esFullText(problemKnowledgeBaseEO,sbCn,null,CutEnum.CN.getValue(),fileTextSb.toString(),targetMarketList);
 		StringBuilder sbEn = new StringBuilder();
-		esFullText(problemKnowledgeBaseEO,null,sbEn,CutEnum.EN.getValue(),fileTextSb.toString());
+		esFullText(problemKnowledgeBaseEO,null,sbEn,CutEnum.EN.getValue(),fileTextSb.toString(),targetMarketList);
 
 		Map<String, Object> stringMapCn = new HashMap<>();
 		this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapCn);
@@ -216,10 +220,11 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 		}
 	}
 
-	public void esFullText(ProblemKnowledgeBaseEO problemKnowledgeBaseEO,StringBuilder sbCn,StringBuilder sbEn,String cut,String fileText){
+	public void esFullText(ProblemKnowledgeBaseEO problemKnowledgeBaseEO,StringBuilder sbCn,StringBuilder sbEn,String cut,String fileText,List<DictModel> targetMarketList){
 		if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions_dicText())){
-				sbCn.append("展示权限" + ":" + problemKnowledgeBaseEO.getShowPermissions_dicText() + " ");
+			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){
+				String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut);
+				sbCn.append("展示权限" + ":" + textByValue + " ");
 			}else {
 				sbCn.append("展示权限" + ":" + "-- ");
 			}
@@ -236,8 +241,19 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 				sbCn.append("问题分类" + ":" + "-- ");
 			}
 
-			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getTargetMarket_dicText())){
-				sbCn.append("市场" + ":" + problemKnowledgeBaseEO.getTargetMarket_dicText() + " ");
+			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getTargetMarket())){
+				String[] targetMarketArr = problemKnowledgeBaseEO.getTargetMarket().split(",");
+				String targetMarket = targetMarketList.stream().filter(e -> {
+					boolean flag = false;
+					for (String s : targetMarketArr) {
+						if (StringUtils.equals(s, e.getValue())) {
+							flag = true;
+						}
+					}
+					return flag;
+				}).map(DictModel::getText).collect(Collectors.joining(","));
+
+				sbCn.append("市场" + ":" + targetMarket + " ");
 			}else {
 				sbCn.append("市场" + ":" + "-- ");
 			}
@@ -255,8 +271,10 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			}*/
 
 			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getContent())){
+				sbCn.append("</br>");
 				sbCn.append("内容" + ":" + problemKnowledgeBaseEO.getContent() + " ");
 			}else {
+				sbCn.append("</br>");
 				sbCn.append("内容" + ":" + "-- ");
 			}
 
@@ -268,7 +286,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 		}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
 
 			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){
-				sbEn.append("Display permission" + ":" + problemKnowledgeBaseEO.getShowPermissions() + " ");
+				String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut);
+				sbEn.append("Display permission" + ":" + textByValue + " ");
 			}else {
 				sbEn.append("Display permission" + ":" + "-- ");
 			}
@@ -286,7 +305,18 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			}
 
 			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getTargetMarket())){
-				sbEn.append("Market" + ":" + problemKnowledgeBaseEO.getTargetMarket() + " ");
+				String[] targetMarketArr = problemKnowledgeBaseEO.getTargetMarket().split(",");
+				String targetMarket = targetMarketList.stream().filter(e -> {
+					boolean flag = false;
+					for (String s : targetMarketArr) {
+						if (StringUtils.equals(s, e.getValue())) {
+							flag = true;
+						}
+					}
+					return flag;
+				}).map(DictModel::getTextEn).collect(Collectors.joining(","));
+
+				sbEn.append("Market" + ":" + targetMarket + " ");
 			}else {
 				sbEn.append("Market" + ":" + "-- ");
 			}
@@ -304,8 +334,10 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			}*/
 
 			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getContent())){
+				sbEn.append("</br>");
 				sbEn.append("Content" + ":" + problemKnowledgeBaseEO.getContent() + " ");
 			}else {
+				sbEn.append("</br>");
 				sbEn.append("Content" + ":" + "-- ");
 			}
 
@@ -349,6 +381,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			convertAfterMap.put("standard_title",problemKnowledgeBaseEO.getStandTitle());
 			convertAfterMap.put("content",problemKnowledgeBaseEO.getContent());
 			convertAfterMap.put("createTime",problemKnowledgeBaseEO.getCreateTime());
+			convertAfterMap.put("show_permissions",problemKnowledgeBaseEO.getShowPermissions());
 		}
 	}
 
@@ -367,10 +400,10 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 		//如果该条问题知识库的展示权限为私密，则创建权限表数据
 		if(StringUtils.equals(problemKnowledgeBaseEO.getShowPermissions(), ShowPermissionsEnum.PRIVACY.getValue())){
 			this.batchInsertProblemKnowledgeBaseUserEO(problemKnowledgeBaseEO);
-			this.deleteElasticsearchData(problemKnowledgeBaseEO.getId());
-		}else {
-			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+			//this.deleteElasticsearchData(problemKnowledgeBaseEO.getId());
 		}
+
+		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
     }
 
 	/**