From 8392eecffc2b510078223eea76f6e191e041edef Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 29 Apr 2022 12:30:40 +0800
Subject: [PATCH] feat: There is no way the, rest es conf

---
 .../service/impl/StandLawsSearchServiceImpl.java    | 13 +++++++++++--
 .../java/com/adc/da/search/bean/SearchCenter.java   |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
index 3b0c5147..5cf509fd 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
@@ -225,6 +225,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append("  ");
             StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
             fullTextSearchEO.put("textContent",textContent.toString());
+            fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
 
             // 全文检索 加入 发布稿 分解单条款内容逻辑
             StringBuilder itemBuilder = new StringBuilder();
@@ -237,8 +238,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
 
             if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
                 fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
+                fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-",""));
             }else {
                 fullTextSearchEO.put("issue_time", "--");
+                fullTextSearchEO.put("issue_time_order", "--");
             }
         } else if("laws".equals(attrInfoMap.get("type"))){
             // 政策全文
@@ -247,7 +250,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                     attrInfoMap.put(key, "null");
                 }
             }
-            fullTextSearchEO.put("title",attrInfoMap.get("lawsNumber")+"  "+attrInfoMap.get("lawsNumber"));
+            fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+"  "+attrInfoMap.get("lawsNumber")+"  "+attrInfoMap.get("lawsName"));
             StringBuilder contentBuilder = new StringBuilder();
             contentBuilder.append("政策分类: ").append(attrInfoMap.get("lawsTypeName")).append("  ");
             contentBuilder.append("政策编号: ").append(attrInfoMap.get("lawsNumber")).append("  ");
@@ -296,11 +299,14 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append("  ");
             StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
             fullTextSearchEO.put("textContent",textContent.toString());
+            fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName")));
 
             if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
                 fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
+                fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-",""));
             }else {
                 fullTextSearchEO.put("issue_time", "--");
+                fullTextSearchEO.put("issue_time_order", "--");
             }
         }else if ("bussstand".equals(attrInfoMap.get("type"))){
 
@@ -309,7 +315,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                     attrInfoMap.put(key, "null");
                 }
             }
-            fullTextSearchEO.put("title",attrInfoMap.get("stand_code"));
+            fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+"  "+attrInfoMap.get("stand_name"));
             StringBuilder contentBuilder = new StringBuilder();
             contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append("  ");
             contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append("  ");
@@ -348,10 +354,13 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
 
             StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
             fullTextSearchEO.put("textContent",textContent.toString());
+            fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
             if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
                 fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
+                fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-",""));
             }else {
                 fullTextSearchEO.put("issue_time", "--");
+                fullTextSearchEO.put("issue_time_order", "--");
             }
         }
         return fullTextSearchEO;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java
index faa17716..7becaa3e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java
@@ -20,7 +20,7 @@ public class SearchCenter {
     private Integer countStand;
 
     @NotNull
-    @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准")
+    @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据")
     private String execType;
 
     @NotNull