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 f6451a54..72bb9e1c 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 减少自动错删)," + - "UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据(其他任务导致ES不同步)") + "UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据(其他任务导致ES不同步), UPDNONEXISTENT_TEXTSTATUS (只支持文本查询接口,文本状态高亮字段不同步重置)") 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 ce54fe20..a63a9fbe 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 @@ -275,6 +275,15 @@ public class ResetSearchCenterService { } }).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); + }else if("UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())){ + List> filterList = searchListData.stream().filter(stringObjectMap -> { + if(stringObjectMap.get("textStatusFull") == null){ + return true; + }else { + return false; + } + }).collect(Collectors.toList()); + esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); }else { esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); } @@ -317,7 +326,8 @@ public class ResetSearchCenterService { } if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) - || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()) + || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()))){ for(SarStandardsInfo sarStandardsInfoEO : updList){ countUpdateSuccess++; standFunc(sarStandardsInfoEO); @@ -550,6 +560,15 @@ public class ResetSearchCenterService { } }).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); + }else if("UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())){ + List> filterList = searchListData.stream().filter(stringObjectMap -> { + if(stringObjectMap.get("textStatusFull") == null){ + return true; + }else { + return false; + } + }).collect(Collectors.toList()); + esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); }else { esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); } @@ -592,7 +611,8 @@ public class ResetSearchCenterService { } if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) - || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()) + || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()))){ for(SarLawsStandInfo sarLawsInfoEO : updList){ countUpdateSuccess++; lawsAttrInfoShowSearchDetails(sarLawsInfoEO); @@ -885,6 +905,15 @@ public class ResetSearchCenterService { } }).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); + }else if("UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())){ + List> filterList = searchListData.stream().filter(stringObjectMap -> { + if(stringObjectMap.get("textStatusFull") == null){ + return true; + }else { + return false; + } + }).collect(Collectors.toList()); + esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); }else { esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); } @@ -931,7 +960,8 @@ public class ResetSearchCenterService { } if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) - || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()) + || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()))){ for(SarBussionessStand sarBussionessStandEO : updList){ countUpdateSuccess++; bussAttrInfoShowSearchDetails(sarBussionessStandEO);