Merge remote-tracking branch 'origin/event_fusion' into event_fusion

src/main/java/com/zzsn/event/controller/common/StatisticalAnalysisController.java

@@ -153,7 +153,6 @@ public class StatisticalAnalysisController {
                 }
             }
         }
-
         for (CountVO countVO : dataList) {
             List<CountVO> children = countVO.getChildren();
             sysDictItemService.changeKey(children, dictItemList);
@@ -188,7 +187,6 @@ public class StatisticalAnalysisController {
                 dataList.add(countVO);
             }
         }
-
         sysDictItemService.changeKey(dataList, dictItemList);
         return Result.OK(dataList);
     }
@@ -294,7 +292,7 @@ public class StatisticalAnalysisController {
             List<SysDictItem> dictItemList = sysDictItemService.listByDictCode("label_infosource_main_type");
             for (SysDictItem sysDictItem : dictItemList) {
                 Label label = new Label();
-                label.setRelationId(sysDictItem.getId());
+                label.setRelationId(sysDictItem.getItemValue());
                 label.setLabelMark("LABEL-20250618-0004");
                 label.setRelationName(sysDictItem.getItemText());
                 labels.add(label);

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

@@ -1743,11 +1743,12 @@ public class EsService {
         subjectIds.add(searchCondition.getSubjectId());
         BoolQueryBuilder boolQuery = buildQuery(searchCondition, subjectIds);
         searchSourceBuilder.query(boolQuery);
+        String[] includeValues = searchCondition.getIncludeValues();
         NestedAggregationBuilder nestedAggregationBuilder = AggregationBuilders.nested("labels", "labels")
                 .subAggregation(AggregationBuilders.terms("groupTag")
                         .field("labels.relationId")
-                        .size(10)
-                        .includeExclude(new IncludeExclude(searchCondition.getIncludeValues(), searchCondition.getExcludeValues())));
+                        .size(includeValues.length)
+                        .includeExclude(new IncludeExclude(includeValues, searchCondition.getExcludeValues())));
         searchSourceBuilder.aggregation(nestedAggregationBuilder);
         searchRequest.source(searchSourceBuilder);
         try {

src/main/java/com/zzsn/event/vo/InfoDataSearchCondition.java

@@ -65,6 +65,8 @@ public class InfoDataSearchCondition {
 
     //平台-审核状态(null-全部;1-通过;2-未审核;3-暂定;4-删除;5-免审核)
     private Integer auditStatus;
+
+
     //审核操作(0：未审核  1：审核通过  2：审核未通过  3：暂定  默认值为0)
     private Integer checkStatus;
     //删除标记(1:删除；0:未删除)