diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/job/HomeSearchCheckEsPlanJob.java b/laws-modules/src/main/java/com/jero/modules/laws/home/job/HomeSearchCheckEsPlanJob.java index 920a4357..984c1952 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/job/HomeSearchCheckEsPlanJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/job/HomeSearchCheckEsPlanJob.java @@ -63,16 +63,6 @@ public class HomeSearchCheckEsPlanJob implements Job { List listType = getList(resourceType); Map mapHash = getTypeCount(); listType.parallelStream().forEach(p->{ - // 删除数据 - JSONObject jsonQuery = new JSONObject(); - JSONObject jsonTerm = new JSONObject(); - JSONObject jsonField = new JSONObject(); - JSONObject jsonValue = new JSONObject(); - jsonValue.put("value",p); - jsonField.put("resource_type",jsonValue); - jsonTerm.put("term",jsonField); - jsonQuery.put("query",jsonTerm); - jeroElasticsearchTemplate.delete(HomeSearchEnum.INDEX_NAME_DOCUMENT_ZQ.getValue(), HomeSearchEnum.TYPE_NAME_DOCUMENT_ZQ.getValue(), jsonQuery); switch (p){ // 比对国内标准 case LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD: @@ -104,6 +94,7 @@ public class HomeSearchCheckEsPlanJob implements Job { m4 = listLawsNewsFeed.size(); } if(count4 != m4 || !StringUtils.isBlank(resourceType)){ + removeES(LawsHomeSearchCommon.LAWS_NEWS_FEED); if(!CollectionUtils.isEmpty(listLawsNewsFeed)){ List listIds = listLawsNewsFeed.stream().map(LawsNewsFeed::getId).collect(Collectors.toList()); addES(listIds, LawsHomeSearchCommon.LAWS_NEWS_FEED); @@ -119,6 +110,7 @@ public class HomeSearchCheckEsPlanJob implements Job { m3 = listLawsEnterpriseStandard.size(); } if(count3 != m3 || !StringUtils.isBlank(resourceType)){ + removeES(LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD); if(!CollectionUtils.isEmpty(listLawsEnterpriseStandard)){ List listIds = listLawsEnterpriseStandard.stream().map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); addES(listIds, LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD); @@ -134,6 +126,7 @@ public class HomeSearchCheckEsPlanJob implements Job { m2 = listLawsOverseasStandard.size(); } if(count2 != m2 || !StringUtils.isBlank(resourceType)){ + removeES(LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD); if(!CollectionUtils.isEmpty(listLawsOverseasStandard)){ List listIds = listLawsOverseasStandard.stream().map(LawsOverseasStandard::getId).collect(Collectors.toList()); addES(listIds, LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD); @@ -150,6 +143,7 @@ public class HomeSearchCheckEsPlanJob implements Job { m1 = listLawsDomesticStandard.size(); } if(count1 != m1 || !StringUtils.isBlank(resourceType)){ + removeES(LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD); if(!CollectionUtils.isEmpty(listLawsDomesticStandard)){ List listIds = listLawsDomesticStandard.stream().map(LawsDomesticStandard::getId).collect(Collectors.toList()); addES(listIds, LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD); @@ -157,6 +151,19 @@ public class HomeSearchCheckEsPlanJob implements Job { } } + private void removeES(String type){ + // 删除数据 + JSONObject jsonQuery = new JSONObject(); + JSONObject jsonTerm = new JSONObject(); + JSONObject jsonField = new JSONObject(); + JSONObject jsonValue = new JSONObject(); + jsonValue.put("value",type); + jsonField.put("resource_type",jsonValue); + jsonTerm.put("term",jsonField); + jsonQuery.put("query",jsonTerm); + jeroElasticsearchTemplate.delete(HomeSearchEnum.INDEX_NAME_DOCUMENT_ZQ.getValue(), HomeSearchEnum.TYPE_NAME_DOCUMENT_ZQ.getValue(), jsonQuery); + } + @NotNull private List getList(String resourceType) { List listType = new ArrayList<>();