From 637491cc1e44d6c4c65ca775dbd24fa8fbe974ab Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 19 Aug 2022 10:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93-?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=E5=A2=9E=E5=8A=A0=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProblemKnowledgeBaseEOServiceImpl.java      | 12 +++++++-----
 .../src/main/resources/application-dev.yml           | 10 +++++-----
 2 files changed, 12 insertions(+), 10 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 1e318355f..036574e31 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
@@ -16,6 +16,7 @@ import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum;
 import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum;
 import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper;
 import com.jero.modules.problemKnowledgeBase.service.*;
+import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum;
 import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.util.StringUtils;
@@ -259,6 +260,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
 	public void putMap(String id,String content,String cut,Map<String, Object> map,String flag,String moduleType){
 		map.put("id",id);
+		map.put("module_type_flag", ModuleTypeFlagEnum.PROBLEM_KNOWLEDGE_BASE_CLASSIFY.getValue()); // 默认法规月报标识
 		map.put("module_type", moduleType);
 		map.put("content",content);
 		map.put("flag",flag);
@@ -282,11 +284,11 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 		}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
 			convertAfterMap.put("id",problemKnowledgeBaseEO.getId());
 			convertAfterMap.put("title",problemKnowledgeBaseEO.getTitle());
-			convertAfterMap.put("Problem Classification",problemKnowledgeBaseEO.getProblemType());
-			convertAfterMap.put("Market",problemKnowledgeBaseEO.getTargetMarket());
-			convertAfterMap.put("Standard No",problemKnowledgeBaseEO.getStandNumber());
-			//convertAfterMap.put("Standard Title",problemKnowledgeBaseEO.getStandTitle());
-			convertAfterMap.put("Content",problemKnowledgeBaseEO.getContent());
+			convertAfterMap.put("problem_type",problemKnowledgeBaseEO.getProblemType());
+			convertAfterMap.put("target_market",problemKnowledgeBaseEO.getTargetMarket());
+			convertAfterMap.put("stand_number",problemKnowledgeBaseEO.getStandNumber());
+			convertAfterMap.put("standard_title",problemKnowledgeBaseEO.getStandTitle());
+			convertAfterMap.put("content",problemKnowledgeBaseEO.getContent());
 			convertAfterMap.put("createTime",problemKnowledgeBaseEO.getCreateTime());
 		}
 	}
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index f3c8ae460..53383a8d2 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -137,10 +137,10 @@ spring:
 
 
           #          url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #          url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
-          #          username: root
-          #          password: 123456
-          #          driver-class-name: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://10.10.10.44:3306/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
+#          username: root
+#          password: 123456
+#          driver-class-name: com.mysql.cj.jdbc.Driver
 #          url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
           url: jdbc:mysql://121.36.69.172:3307/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
@@ -158,7 +158,7 @@ spring:
     allow-bean-definition-overriding: true
   #redis 配置
   redis:
-    database: 6
+    database: 13
     host: 121.36.69.172
     lettuce:
       pool: