Merge branch 'develop_master' into FOTON

adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java

@@ -226,6 +226,9 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
             fullTextSearchEO.put("textContent",textContent.toString());
             fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
+            fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort")));
+            fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber")));
+            fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("standName")));
 
             // 全文检索 加入 发布稿 分解单条款内容逻辑
             StringBuilder itemBuilder = new StringBuilder();
@@ -300,6 +303,9 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
             fullTextSearchEO.put("textContent",textContent.toString());
             fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName")));
+            fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("lawsTypeName")));
+            fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("lawsNumber")));
+            fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("lawsName")));
 
             if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
                 fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))));
@@ -355,6 +361,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
             fullTextSearchEO.put("textContent",textContent.toString());
             fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
+            fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort")));
+            fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber")));
+            fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("stand_name")));
+
             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("-",""));

adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java

@@ -131,7 +131,7 @@ public class SendBussMQService {
         }
         saveMap.put("standYear",infoEO.getStandYear());
         saveMap.put("stand_year",infoEO.getStandYear());
-        saveMap.put("standNumber",infoEO.getStandCode());
+        saveMap.put("standNumber",infoEO.getStandNumber());
         saveMap.put("stand_code",infoEO.getStandCode());
         saveMap = dealNumberMsg(saveMap,infoEO,infoEO.getStandSort());
         saveMap.put("nameshow",infoEO.getStandName());

adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java

@@ -69,19 +69,39 @@ public class ResetSearchCenterService {
     @Async
     public ResponseMessage resetALLSearchCenter(SearchCenter searchCenter) throws Exception{
         Boolean getFulltextserchIndex = elasticsearchService.isIndexExist("fulltextserch");
-
+        SearchCenter standSearch = new SearchCenter();
-        ResponseMessage stand = resetStandSearchCenter(new SarStandardsInfoEOPage(),searchCenter);
+        QueryWrapper qw = new QueryWrapper();
+        qw.eq("VALID_FLAG","0");
+        int count = iSarStandardsInfoService.count(qw);
+        standSearch.setExecType(searchCenter.getExecType());
+        standSearch.setCountStand(count);
+        SarStandardsInfoEOPage page = new SarStandardsInfoEOPage();
+        ResponseMessage stand = resetStandSearchCenter(page,standSearch);
         List<String> r = new ArrayList<>();
         if(stand.isOk() && StringUtils.isNotBlank(stand.getData().toString())){
             r.add(stand.getData().toString());
         }
 
-        ResponseMessage laws = resetLawsSearchCenter(new SarLawsStandInfoPage(),searchCenter);
+        SearchCenter lawsSearch = new SearchCenter();
+        QueryWrapper qw2 = new QueryWrapper();
+        qw2.eq("VALID_FLAG","0");
+        int count2 = iSarLawsStandInfoService.count(qw2);
+        lawsSearch.setExecType(searchCenter.getExecType());
+        lawsSearch.setCountStand(count2);
+        SarLawsStandInfoPage lawsPage = new SarLawsStandInfoPage();
+        ResponseMessage laws = resetLawsSearchCenter(lawsPage,lawsSearch);
         if(laws.isOk() && StringUtils.isNotBlank(laws.getData().toString())){
             r.add(laws.getData().toString());
         }
 
-        ResponseMessage buss = resetBussStandSearchCenter(new SarBussionessStandEOPage(),searchCenter);
+        SearchCenter bussSearch = new SearchCenter();
+        QueryWrapper qw3 = new QueryWrapper();
+        qw3.eq("VALID_FLAG","0");
+        int count3 = iSarBussionessStandService.count(qw3);
+        bussSearch.setExecType(searchCenter.getExecType());
+        bussSearch.setCountStand(count3);
+        SarBussionessStandEOPage bussPage = new SarBussionessStandEOPage();
+        ResponseMessage buss = resetBussStandSearchCenter(bussPage,bussSearch);
         if(buss.isOk() && StringUtils.isNotBlank(buss.getData().toString())){
             r.add(buss.getData().toString());
         }
@@ -192,7 +212,12 @@ public class ResetSearchCenterService {
             // 差集 (list2 - list1) 删除
             List<String> delDataList = esIdList.stream().filter(num -> !standIdList.contains(num))
                     .collect(Collectors.toList());
-            delList.addAll(delDataList);
+            // 可以更新IDLIST 删除 ES
+            if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){
+                delList.addAll(searchCenter.getIdList());
+            }else{
+                delList.addAll(delDataList);
+            }
 
         }else {
             // 新增
@@ -273,7 +298,12 @@ public class ResetSearchCenterService {
             // 差集 (list2 - list1) 删除
             List<String> delDataList = esIdList.stream().filter(num -> !standIdList.contains(num))
                     .collect(Collectors.toList());
-            delList.addAll(delDataList);
+            // 可以更新IDLIST 删除 ES
+            if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){
+                delList.addAll(searchCenter.getIdList());
+            }else{
+                delList.addAll(delDataList);
+            }
 
         }else {
             // 新增
@@ -367,8 +397,12 @@ public class ResetSearchCenterService {
             // 差集 (list2 - list1) 删除
             List<String> delDataList = esIdList.stream().filter(num -> !standIdList.contains(num))
                     .collect(Collectors.toList());
-            delList.addAll(delDataList);
+            // 可以更新IDLIST 删除 ES
-
+            if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){
+                delList.addAll(searchCenter.getIdList());
+            }else{
+                delList.addAll(delDataList);
+            }
         }else {
             // 新增
             insList.addAll(rowsStand);