报告数据接口增加 ids 筛选条件

src/main/java/com/zzsn/event/controller/reportData/ReportDataController.java

@@ -240,6 +240,7 @@ public class ReportDataController {
         }
         return Result.OK(list);
     }
+
     /**
      * 标签分析(按标签分组)
      *
@@ -293,7 +294,6 @@ public class ReportDataController {
     }
 
 
-
     /**
      * 事件对应专题库的资讯分页列表
      *
@@ -375,6 +375,10 @@ public class ReportDataController {
     private BoolQueryBuilder buildQuery(SearchCondition searchCondition) {
         //创建查询对象
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+        List<String> ids = searchCondition.getIds();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            boolQuery.must(QueryBuilders.termsQuery("id", ids));
+        } else {
             String subjectId = searchCondition.getSubjectId();
             boolQuery.must(QueryBuilders.termsQuery("subjectId.keyword", subjectId));
             String searchScope = searchCondition.getSearchScope();
@@ -468,9 +472,9 @@ public class ReportDataController {
                 //分号隔开的标签查询用且的关系
                 String[] split = composeSearchLabelIds.split(";");
                 for (String items : split) {
-                List<String> ids = Arrays.asList(items.split(","));
+                    List<String> labelIds = Arrays.asList(items.split(","));
                     NestedQueryBuilder nestedQueryBuilder = QueryBuilders
-                        .nestedQuery("labels", QueryBuilders.termsQuery("labels.relationId", ids), ScoreMode.None);
+                            .nestedQuery("labels", QueryBuilders.termsQuery("labels.relationId", labelIds), ScoreMode.None);
                     boolQuery.must(nestedQueryBuilder);
                 }
             }
@@ -512,10 +516,11 @@ public class ReportDataController {
                 TermsQueryBuilder relationIdQuery = QueryBuilders.termsQuery("labels.relationId", collect);
                 boolQuery.must(QueryBuilders.nestedQuery("labels", relationIdQuery, ScoreMode.None));
             }
+        }
         return boolQuery;
     }
 
-    private String[] getIndex(String subjectId){
+    private String[] getIndex(String subjectId) {
         List<String> subjectIdList = new ArrayList<>();
         subjectIdList.add(subjectId);
         String minDate = subjectService.getMinCreateTime(subjectIdList);

src/main/java/com/zzsn/event/controller/reportData/SearchCondition.java

@@ -11,6 +11,9 @@ import java.util.List;
 @Data
 public class SearchCondition {
 
+    //资讯id集合，和下面所有查询条件互斥
+    private List<String> ids;
+
     //专题id
     @FieldDescription(value = "专题id")
     private String subjectId;