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-04-30 07:59:32 +08:00
parent 6bf0e1260d 8ac506cf45
commit 7b9f761946
2 changed files with 5 additions and 6 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
+2 -3
View File
@@ -15,12 +15,11 @@ import java.util.List;
@Data
public class SearchCenter {
@NotNull
@ApiModelProperty(value = "分页查询总数")
@ApiModelProperty(value = "分页查询总数 可不填 自动带入总数")
private Integer countStand;
@NotNull
@ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据")
@ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）")
private String execType;
@NotNull
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+3 -3
View File
@@ -244,7 +244,7 @@ public class ResetSearchCenterService {
}
}
if(!delList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "DEL".equals(searchCenter.getExecType().toUpperCase()))){
if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){
elasticsearchService.deleteBatchId(delList,"stand");
elasticsearchService.deleteBatchId(delList,"fulltextserch");
}
@@ -330,7 +330,7 @@ public class ResetSearchCenterService {
}
}
if(!delList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "DEL".equals(searchCenter.getExecType().toUpperCase()))){
if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){
elasticsearchService.deleteBatchId(delList,"laws");
elasticsearchService.deleteBatchId(delList,"fulltextserch");
}
@@ -428,7 +428,7 @@ public class ResetSearchCenterService {
}
}
if(!delList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "DEL".equals(searchCenter.getExecType().toUpperCase()))){
if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){
elasticsearchService.deleteBatchId(delList,"bussstand");
elasticsearchService.deleteBatchId(delList,"fulltextserch");
}