diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index f117718f..725c105c 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -110,6 +110,7 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile"); // 重置ES + addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetALLSearchCenter"); addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetAStandSearchCenter"); addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetBLawsSearchCenter"); addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetCBussStandSearchCenter"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java b/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java index 8bea59d2..89e8dc56 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java @@ -23,6 +23,11 @@ public class ResetSearchCenterController extends BaseController r = new ArrayList<>(); + if(stand.isOk() && StringUtils.isNotBlank(stand.getData().toString())){ + r.add(stand.getData().toString()); + } + + ResponseMessage laws = resetLawsSearchCenter(new SarLawsStandInfoPage()); + if(laws.isOk() && StringUtils.isNotBlank(laws.getData().toString())){ + r.add(laws.getData().toString()); + } + + ResponseMessage buss = resetBussStandSearchCenter(new SarBussionessStandEOPage()); + if(buss.isOk() && StringUtils.isNotBlank(buss.getData().toString())){ + r.add(buss.getData().toString()); + } + + String res = String.join(", ", r); + + return Result.success(res); + } + //重建国内外标准 + @Async public ResponseMessage resetStandSearchCenter(SarStandardsInfoEOPage page) throws Exception{ Boolean getStandIndex = elasticsearchService.isIndexExist("stand"); if(getStandIndex){ @@ -85,9 +112,10 @@ public class ResetSearchCenterService { } } - return Result.success("重置:"+ countSuccess + "条"); + return Result.success("重置国内外:"+ countSuccess + "条"); } + @Async public ResponseMessage resetLawsSearchCenter(SarLawsStandInfoPage sarLawsInfoEOPage) throws Exception{ Boolean getLawsIndex = elasticsearchService.isIndexExist("laws"); if(getLawsIndex){ @@ -110,9 +138,10 @@ public class ResetSearchCenterService { } } - return Result.success("重置:"+ countSuccess + "条"); + return Result.success("重置国内外政策:"+ countSuccess + "条"); } + @Async public ResponseMessage resetBussStandSearchCenter(SarBussionessStandEOPage sarBussionessStandEOPage) throws Exception{ Boolean getbussstandIndex = elasticsearchService.isIndexExist("bussstand"); int number = 0; @@ -135,9 +164,10 @@ public class ResetSearchCenterService { if (getAllList != null && !getAllList.isEmpty()) { sendESForBussStand(getAllList,countSuccess); } - return Result.success("重置:"+ number + "条"); + return Result.success("重置企标:"+ number + "条"); } + @Async public void sendESForBussStand(List getAllList,int countSuccess) throws Exception { for(SarBussionessStand sarBussionessStandEO : getAllList){ countSuccess++; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java index e59d1507..617abee5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java @@ -98,7 +98,12 @@ public class SysInfoEOService { String names = ""; if (StringUtils.isNotBlank(codes)) { String[] idArr = codes.split(","); - names = dicTypeEODao.getDicNamesByCodes(Arrays.asList(idArr)); + String names1 = dicTypeEODao.getDicNamesByCodes(Arrays.asList(idArr)); + if(StringUtils.isNotBlank(names1) && names1.contains(",")){ + List list1 = Arrays.asList(names1.split(",")); + List list = list1.stream().distinct().collect(Collectors.toList()); + names = String.join(",",list); + } } return names; }