Merge branch 'release' into 'master'

Release

See merge request !499

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java

@@ -2966,10 +2966,11 @@ public class MarkDataServiceImpl implements MarkDataService {
             String projectId = UserThreadLocal.getProjectId();
             dto.setProjectId(projectId);
             String linkedGroupId = projectService.getProjectById(projectId).getBrandLinkedGroupId();
+            String aggTitle = dto.getAggTitle();
             CompletableFuture<JSONObject> firstArticleFuture = CompletableFuture.supplyAsync(() -> {
                 try {
                     // 最早发布
-                    BaseMap firstArticle = getAnalyzeFirstArticle(dto, null);
+                    BaseMap firstArticle = getAnalyzeFirstArticle(dto, aggTitle);
                     // 匹配重要渠道
                     JSONObject firstSensitiveChannel = channelService.matchYuQingSensitiveChannel(linkedGroupId, firstArticle.getSource());
                     JSONObject firstArticleJson = JSONObject.parseObject(JSONObject.toJSONString(firstArticle));
@@ -2982,7 +2983,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             CompletableFuture<JSONObject> lastArticleFuture = CompletableFuture.supplyAsync(() -> {
                 try {
                     // 最新发布
-                    BaseMap lastArticle = getAnalyzeLastArticle(dto, null);
+                    BaseMap lastArticle = getAnalyzeLastArticle(dto, aggTitle);
                     // 匹配重要渠道
                     JSONObject lastSensitiveChannel = channelService.matchYuQingSensitiveChannel(linkedGroupId, lastArticle.getSource());
                     JSONObject lastArticleJson = JSONObject.parseObject(JSONObject.toJSONString(lastArticle));
@@ -3020,7 +3021,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             dto.setProjectId(UserThreadLocal.getProjectId());
             BoolQueryBuilder query = yuqingAnalyzeQuery(dto);
             DateHistogramAggregationBuilder daysAggregationBuilder =
-                    AggregationBuilders.dateHistogram("timeAgg").field("time").calendarInterval(DateHistogramInterval.DAY);
+                    AggregationBuilders.dateHistogram("timeAgg").field("time").calendarInterval(DateHistogramInterval.DAY).offset("16h");
             TermsAggregationBuilder sourceAggregationBuilder = AggregationBuilders.terms("sourceAgg").field("source").size(10000);
             // response
             SearchResponse searchResponse = esClientDao.searchResponse(indexes, null, query,
@@ -3412,6 +3413,9 @@ public class MarkDataServiceImpl implements MarkDataService {
         if (Objects.nonNull(aggTitle)){
             postFilter.must(QueryBuilders.termQuery("agg_title.keyword", aggTitle));
         }
+        if (Objects.isNull(aggTitle) && Objects.nonNull(dto.getAggTitle())){
+            postFilter.must(QueryBuilders.termQuery("agg_title.keyword", dto.getAggTitle()));
+        }
         return postFilter;
     }
 
@@ -3937,5 +3941,4 @@ public class MarkDataServiceImpl implements MarkDataService {
         }
         return null;
     }
-
 }
\ No newline at end of file