Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!470

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

@@ -131,7 +131,12 @@ public class SendBussMQService {
         }
         saveMap.put("standYear",infoEO.getStandYear());
         saveMap.put("stand_year",infoEO.getStandYear());
-        saveMap.put("standNumber",infoEO.getStandNumber());
+        if(jsonobject.get("standNumber") != null){
+            saveMap.put("standNumber",jsonobject.get("standNumber"));
+        }else {
+            saveMap.put("standNumber","");
+        }
+
         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/bean/SearchCenter.java

@@ -15,8 +15,8 @@ import java.util.List;
 @Data
 public class SearchCenter {
 
-    @ApiModelProperty(value = "分页查询总数 可不填 自动带入总数")
+//    @ApiModelProperty(value = "分页查询总数 可不填 自动带入总数")
-    private Integer countStand;
+//    private Integer countStand;
 
     @NotNull
     @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）")

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

@@ -70,11 +70,7 @@ public class ResetSearchCenterService {
     public ResponseMessage resetALLSearchCenter(SearchCenter searchCenter) throws Exception{
         Boolean getFulltextserchIndex = elasticsearchService.isIndexExist("fulltextserch");
         SearchCenter standSearch = new SearchCenter();
-        QueryWrapper qw = new QueryWrapper();
-        qw.eq("VALID_FLAG","0");
-        int count = iSarStandardsInfoService.count(qw);
         standSearch.setExecType(searchCenter.getExecType());
-        standSearch.setCountStand(count);
         if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){
             standSearch.setIdList(searchCenter.getIdList());
         }
@@ -86,11 +82,7 @@ public class ResetSearchCenterService {
         }
 
         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);
         if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){
             lawsSearch.setIdList(searchCenter.getIdList());
         }
@@ -101,11 +93,7 @@ public class ResetSearchCenterService {
         }
 
         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);
         if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){
             bussSearch.setIdList(searchCenter.getIdList());
         }
@@ -125,11 +113,7 @@ public class ResetSearchCenterService {
     public ResponseMessage syncResetALLSearchCenter(SearchCenter searchCenter) throws Exception{
         Boolean getFulltextserchIndex = elasticsearchService.isIndexExist("fulltextserch");
         SearchCenter standSearch = new 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();
         page.setSyncParam("sync");
         ResponseMessage stand = resetStandSearchCenter(page,standSearch);
@@ -139,11 +123,7 @@ public class ResetSearchCenterService {
         }
 
         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();
         page.setSyncParam("sync");
         ResponseMessage laws = resetLawsSearchCenter(lawsPage,lawsSearch);
@@ -152,11 +132,7 @@ public class ResetSearchCenterService {
         }
 
         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();
         page.setSyncParam("sync");
         ResponseMessage buss = resetBussStandSearchCenter(bussPage,bussSearch);
@@ -193,8 +169,11 @@ public class ResetSearchCenterService {
             String[] result = searchCenter.getIdList().toArray(new String[0]);
             page.setIdlist(result);
         }
-
+        QueryWrapper qw = new QueryWrapper();
-        page.setPageSize(searchCenter.getCountStand());
+        qw.eq("VALID_FLAG","0");
+        int count = iSarStandardsInfoService.count(qw);
+        if(count > 0){
+            page.setPageSize(count);
             page.setMenuId("nomenu");
             page.setStandType("ALL");
             List<SarStandardsInfo> rowsStand = iSarStandardsInfoService.getSarStandardsInfoPage(page);
@@ -272,6 +251,10 @@ public class ResetSearchCenterService {
             }
             logger.info("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据");
             return Result.success("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据");
+        }else {
+            return Result.error("未查询到标准数据");
+        }
+
     }
 
     @Async
@@ -294,7 +277,11 @@ public class ResetSearchCenterService {
 
         int countUpdateSuccess = 0;
         int countAddSuccess = 0;
-        sarLawsInfoEOPage.setPageSize(searchCenter.getCountStand());
+        QueryWrapper qw2 = new QueryWrapper();
+        qw2.eq("VALID_FLAG","0");
+        int count2 = iSarLawsStandInfoService.count(qw2);
+        if(count2 > 0){
+            sarLawsInfoEOPage.setPageSize(count2);
             List<SarLawsStandInfo> rowsStand = iSarLawsStandInfoService.getSarStandardsInfoPage(sarLawsInfoEOPage);
             List<SarLawsStandInfo> insList = new ArrayList<>();
             List<SarLawsStandInfo> updList = new ArrayList<>();
@@ -371,6 +358,10 @@ public class ResetSearchCenterService {
 
             logger.info("重置国内外政策：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外政策共："+rowsStand.size()+"条）数据");
             return Result.success("");
+        }else {
+            return Result.error("未查询到国内外政策数据");
+        }
+
     }
 
     private void idListFunc(SarLawsStandInfoPage sarLawsInfoEOPage, SearchCenter searchCenter) {
@@ -404,7 +395,13 @@ public class ResetSearchCenterService {
         int countUpdateSuccess = 0;
         int countAddSuccess = 0;
         sarBussionessStandEOPage.setMenuId("0");
-        sarBussionessStandEOPage.setPageSize(searchCenter.getCountStand());
+
+        QueryWrapper qw3 = new QueryWrapper();
+        qw3.eq("VALID_FLAG","0");
+        int count3 = iSarBussionessStandService.count(qw3);
+
+        if(count3 > 0){
+            sarBussionessStandEOPage.setPageSize(count3);
 
             List<SarBussionessStand> rowsStand = iSarBussionessStandService.getSarBussionStandPage(sarBussionessStandEOPage);
             List<SarBussionessStand> insList = new ArrayList<>();
@@ -481,6 +478,10 @@ public class ResetSearchCenterService {
             }
             logger.info("重置企标：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（企标共："+rowsStand.size()+"条）数据");
             return Result.success("");
+        }else {
+            return Result.error("未查询到企标数据");
+        }
+
     }
 
     /**