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

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-05-26 12:39:51 +08:00
parent 8ce4ab85ae e7179fc7d6
commit 04a8c7429a
3 changed files with 8 additions and 8 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 减少自动错删）," +
"UPDATENONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）") "UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）")
private String execType; private String execType;
@NotNull @NotNull
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+6 -6
View File
@@ -264,7 +264,7 @@ public class ResetSearchCenterService {
List<Map<String, Object>> searchListData = elasticsearchService.searchAll("fulltextserch",search); List<Map<String, Object>> searchListData = elasticsearchService.searchAll("fulltextserch",search);
List<String> esIdList = new ArrayList<>(); List<String> esIdList = new ArrayList<>();
if("UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){ if("UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){
List<Map<String, Object>> filterList = searchListData.stream().filter(stringObjectMap -> { List<Map<String, Object>> filterList = searchListData.stream().filter(stringObjectMap -> {
if(stringObjectMap.get("standTypeOrder") == null){ if(stringObjectMap.get("standTypeOrder") == null){
return true; return true;
@@ -315,7 +315,7 @@ 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())
|| "UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){
for(SarStandardsInfo sarStandardsInfoEO : updList){ for(SarStandardsInfo sarStandardsInfoEO : updList){
countUpdateSuccess++; countUpdateSuccess++;
standFunc(sarStandardsInfoEO); standFunc(sarStandardsInfoEO);
@@ -536,7 +536,7 @@ public class ResetSearchCenterService {
List<Map<String, Object>> searchListData = elasticsearchService.searchAll("fulltextserch",search); List<Map<String, Object>> searchListData = elasticsearchService.searchAll("fulltextserch",search);
List<String> esIdList = new ArrayList<>(); List<String> esIdList = new ArrayList<>();
if("UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){ if("UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){
List<Map<String, Object>> filterList = searchListData.stream().filter(stringObjectMap -> { List<Map<String, Object>> filterList = searchListData.stream().filter(stringObjectMap -> {
if(stringObjectMap.get("standTypeOrder") == null){ if(stringObjectMap.get("standTypeOrder") == null){
return true; return true;
@@ -587,7 +587,7 @@ 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())
|| "UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){
for(SarLawsStandInfo sarLawsInfoEO : updList){ for(SarLawsStandInfo sarLawsInfoEO : updList){
countUpdateSuccess++; countUpdateSuccess++;
lawsAttrInfoShowSearchDetails(sarLawsInfoEO); lawsAttrInfoShowSearchDetails(sarLawsInfoEO);
@@ -868,7 +868,7 @@ public class ResetSearchCenterService {
List<Map<String, Object>> searchListData = elasticsearchService.searchAll("fulltextserch",search); List<Map<String, Object>> searchListData = elasticsearchService.searchAll("fulltextserch",search);
List<String> esIdList = new ArrayList<>(); List<String> esIdList = new ArrayList<>();
if("UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){ if("UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase())){
List<Map<String, Object>> filterList = searchListData.stream().filter(stringObjectMap -> { List<Map<String, Object>> filterList = searchListData.stream().filter(stringObjectMap -> {
if(stringObjectMap.get("standTypeOrder") == null){ if(stringObjectMap.get("standTypeOrder") == null){
return true; return true;
@@ -923,7 +923,7 @@ 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())
|| "UPDATENONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){
for(SarBussionessStand sarBussionessStandEO : updList){ for(SarBussionessStand sarBussionessStandEO : updList){
countUpdateSuccess++; countUpdateSuccess++;
bussAttrInfoShowSearchDetails(sarBussionessStandEO); bussAttrInfoShowSearchDetails(sarBussionessStandEO);
adc-da-slrs/src/main/java/com/adc/da/search/sync/restSearchSync.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class restSearchSync {
// 每天0点1分执行 重置ES 自动更新、新增 // 每天0点1分执行 重置ES 自动更新、新增
// @Scheduled(cron="0 0 1 1 * ?") // @Scheduled(cron="0 0 1 1 * ?")
@Scheduled(cron = "0 1 0 * * ?") // @Scheduled(cron = "0 1 0 * * ?")
@Async @Async
public void StandScheduledJobMonthBegin(){ public void StandScheduledJobMonthBegin(){
if(isNotScheduled){ if(isNotScheduled){