From 4c100310eac0e2fa8f1ac68eaac93c9a72d45cba Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 26 May 2022 12:08:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E4=BB=80=E4=B9=88=E6=97=B6=E5=80=99=E9=9C=80=E6=B1=82=20?= =?UTF-8?q?=E5=9C=A8=E5=BC=80=E5=90=AF=20=E5=AE=9A=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B07=E5=A4=A9=E5=86=85ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/search/sync/restSearchSync.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/sync/restSearchSync.java b/adc-da-slrs/src/main/java/com/adc/da/search/sync/restSearchSync.java index 5cf899a9..948f3d4f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/sync/restSearchSync.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/sync/restSearchSync.java @@ -48,7 +48,7 @@ public class restSearchSync { // 每天0点1分执行 重置ES 自动更新、新增 // @Scheduled(cron="0 0 1 1 * ?") - @Scheduled(cron = "0 1 0 * * ?") +// @Scheduled(cron = "0 1 0 * * ?") @Async public void StandScheduledJobMonthBegin(){ if(isNotScheduled){ From dd7c5d65d4bfd30c4543ab8770a40edf08f71a01 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 26 May 2022 12:25:44 +0800 Subject: [PATCH 2/2] feat: There is no way the, xxx --- .../java/com/adc/da/search/bean/SearchCenter.java | 2 +- .../da/search/server/ResetSearchCenterService.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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 03cf6688..f6451a54 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 @@ -24,7 +24,7 @@ public class SearchCenter { @NotNull @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准," + " DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）," + - "UPDATENONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）") + "UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）") private String execType; @NotNull diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index e1aeeefc..aa187462 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -264,7 +264,7 @@ public class ResetSearchCenterService { List> searchListData = elasticsearchService.searchAll("fulltextserch",search); List esIdList = new ArrayList<>(); - if("UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){ + if("UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){ List> filterList = searchListData.stream().filter(stringObjectMap -> { if(stringObjectMap.get("standTypeOrder") == null){ return true; @@ -315,7 +315,7 @@ public class ResetSearchCenterService { } if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) - || "UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ for(SarStandardsInfo sarStandardsInfoEO : updList){ countUpdateSuccess++; standFunc(sarStandardsInfoEO); @@ -536,7 +536,7 @@ public class ResetSearchCenterService { List> searchListData = elasticsearchService.searchAll("fulltextserch",search); List esIdList = new ArrayList<>(); - if("UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){ + if("UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){ List> filterList = searchListData.stream().filter(stringObjectMap -> { if(stringObjectMap.get("standTypeOrder") == null){ return true; @@ -587,7 +587,7 @@ public class ResetSearchCenterService { } if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) - || "UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ for(SarLawsStandInfo sarLawsInfoEO : updList){ countUpdateSuccess++; lawsAttrInfoShowSearchDetails(sarLawsInfoEO); @@ -868,7 +868,7 @@ public class ResetSearchCenterService { List> searchListData = elasticsearchService.searchAll("fulltextserch",search); List esIdList = new ArrayList<>(); - if("UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){ + if("UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){ List> filterList = searchListData.stream().filter(stringObjectMap -> { if(stringObjectMap.get("standTypeOrder") == null){ return true; @@ -923,7 +923,7 @@ public class ResetSearchCenterService { } if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) - || "UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ for(SarBussionessStand sarBussionessStandEO : updList){ countUpdateSuccess++; bussAttrInfoShowSearchDetails(sarBussionessStandEO);