自定义专题改版接口开发

src/main/java/com/zzsn/event/es/EsService.java

@@ -2005,7 +2005,7 @@ public class EsService {
             Integer category = searchCondition.getCategory();
             boolQuery.must(QueryBuilders.termsQuery("subjectId.keyword", subjectIdList));
             //单个专题/事件，默认加上专题/事件的时间范围
-            /*if (subjectIdList.size() == 1) {
+            if (subjectIdList.size() == 1) {
                 String configStartTime = null;
                 String configEndTime = null;
                 String id = subjectIdList.get(0);
@@ -2043,7 +2043,7 @@ public class EsService {
                 } else {
                     boolQuery.filter(QueryBuilders.rangeQuery("publishDate").lte(EsDateUtil.esFieldDateFormat(DateUtil.dateToString(new Date()))));
                 }
-            }*/
+            }
         }
         //高级查询数据处理
         BoolQueryBuilder superQuery = buildSuperQuery(searchCondition.getSuperQueryMatchType(), searchCondition.getSuperQueryParams());

src/main/java/com/zzsn/event/service/impl/InformationServiceImpl.java

@@ -1176,7 +1176,13 @@ public class InformationServiceImpl implements InformationService {
         subjectIdList.add(searchCondition.getSubjectId());
         String minCreateTime = subjectService.getMinCreateTime(subjectIdList);
         String[] indexArr = EsIndexUtil.getIndexIntervalYearStr(Constants.SUBJECT_INDEX, minCreateTime);
-        BoolQueryBuilder buildQuery = esService.buildQuery(searchCondition, subjectIdList);
+        List<String> ids = searchCondition.getIds();
+        BoolQueryBuilder buildQuery;
+        if (CollectionUtils.isEmpty(ids)) {
+            buildQuery = esService.buildQuery(searchCondition, subjectIdList);
+        } else {
+            buildQuery = QueryBuilders.boolQuery().must(QueryBuilders.termsQuery("id", ids));
+        }
         Map<String, Object> modifyParams = new HashMap<>();
         modifyParams.put("checkStatus", 1);
         modifyParams.put("deleteFlag",0);
@@ -1189,7 +1195,13 @@ public class InformationServiceImpl implements InformationService {
         subjectIdList.add(searchCondition.getSubjectId());
         String minCreateTime = subjectService.getMinCreateTime(subjectIdList);
         String[] indexArr = EsIndexUtil.getIndexIntervalYearStr(Constants.SUBJECT_INDEX, minCreateTime);
-        BoolQueryBuilder buildQuery = esService.buildQuery(searchCondition, subjectIdList);
+        List<String> ids = searchCondition.getIds();
+        BoolQueryBuilder buildQuery;
+        if (CollectionUtils.isEmpty(ids)) {
+            buildQuery = esService.buildQuery(searchCondition, subjectIdList);
+        } else {
+            buildQuery = QueryBuilders.boolQuery().must(QueryBuilders.termsQuery("id", ids));
+        }
         Map<String, Object> modifyParams = new HashMap<>();
         modifyParams.put("checkStatus",3);
         modifyParams.put("deleteFlag",0);
@@ -1202,7 +1214,13 @@ public class InformationServiceImpl implements InformationService {
         subjectIdList.add(searchCondition.getSubjectId());
         String minCreateTime = subjectService.getMinCreateTime(subjectIdList);
         String[] indexArr = EsIndexUtil.getIndexIntervalYearStr(Constants.SUBJECT_INDEX, minCreateTime);
-        BoolQueryBuilder buildQuery = esService.buildQuery(searchCondition, subjectIdList);
+        List<String> ids = searchCondition.getIds();
+        BoolQueryBuilder buildQuery;
+        if (CollectionUtils.isEmpty(ids)) {
+            buildQuery = esService.buildQuery(searchCondition, subjectIdList);
+        } else {
+            buildQuery = QueryBuilders.boolQuery().must(QueryBuilders.termsQuery("id", ids));
+        }
         Map<String, Object> modifyParams = new HashMap<>();
         modifyParams.put("deleteFlag",1);
         esOpUtil.batchUpdateScript(indexArr, buildQuery, modifyParams);