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

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

@@ -834,6 +834,15 @@ public class EsService {
         } else {
             boolQuery.filter(QueryBuilders.rangeQuery("publishDate").lte(EsDateUtil.esFieldDateFormat(DateUtil.dateToString(new Date()))));
         }
+        //采集时间过滤筛选
+        if (StringUtils.isNotBlank(eventDataCondition.getCollectStartTime())) {
+            boolQuery.filter(QueryBuilders.rangeQuery("createDate").gte(EsDateUtil.esFieldDateFormat(eventDataCondition.getCollectStartTime())));
+        }
+        if (StringUtils.isNotBlank(eventDataCondition.getCollectEndTime())) {
+            boolQuery.filter(QueryBuilders.rangeQuery("createDate").lte(EsDateUtil.esFieldDateFormat(eventDataCondition.getCollectEndTime())));
+        } else {
+            boolQuery.filter(QueryBuilders.rangeQuery("createDate").lte(EsDateUtil.esFieldDateFormat(DateUtil.dateToString(new Date()))));
+        }
         if (eventDataCondition.getLabelName() != null) {
             BoolQueryBuilder nestedBoolQueryBuilder = QueryBuilders.boolQuery();
             TermQueryBuilder relationIdQuery = QueryBuilders.termQuery("labels.relationName", eventDataCondition.getLabelName());

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

@@ -44,6 +44,11 @@ public class InfoDataSearchCondition {
 
     //结束时间
     private String endTime;
+    //采集时间开始时间
+    private String collectStartTime;
+
+    //采集时间结束时间
+    private String collectEndTime;
 
     /*-----------------单个专题时，起效-----------*/
     //专题配置的开始时间