FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the, Es

See merge request LiuChao/foton-slrs-system-rest!521
This commit is contained in:
super_liu
2022-06-11 19:59:38 +08:00
parent 1dc8c4e57f 4f285b71bb
commit b05db11a5e
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class SearchCenter {
@NotNull @NotNull
@ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准," + @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准," +
" DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）," + " DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）," +
"UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）") "UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）, UPDNONEXISTENT_TEXTSTATUS (只支持文本查询接口,文本状态高亮字段不同步重置)")
private String execType; private String execType;
@NotNull @NotNull
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+33 -3
View File
@@ -275,6 +275,15 @@ public class ResetSearchCenterService {
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());
esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
}else if("UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())){
List<Map<String, Object>> 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 { }else {
esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); 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()) 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){ for(SarStandardsInfo sarStandardsInfoEO : updList){
countUpdateSuccess++; countUpdateSuccess++;
standFunc(sarStandardsInfoEO); standFunc(sarStandardsInfoEO);
@@ -550,6 +560,15 @@ public class ResetSearchCenterService {
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());
esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
}else if("UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())){
List<Map<String, Object>> 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 { }else {
esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); 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()) 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){ for(SarLawsStandInfo sarLawsInfoEO : updList){
countUpdateSuccess++; countUpdateSuccess++;
lawsAttrInfoShowSearchDetails(sarLawsInfoEO); lawsAttrInfoShowSearchDetails(sarLawsInfoEO);
@@ -885,6 +905,15 @@ public class ResetSearchCenterService {
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());
esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
}else if("UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())){
List<Map<String, Object>> 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 { }else {
esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); 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()) 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){ for(SarBussionessStand sarBussionessStandEO : updList){
countUpdateSuccess++; countUpdateSuccess++;
bussAttrInfoShowSearchDetails(sarBussionessStandEO); bussAttrInfoShowSearchDetails(sarBussionessStandEO);