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

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

@@ -934,7 +934,7 @@ public class MarkDataServiceImpl implements MarkDataService {
         TermsAggregationBuilder sourceAggregationBuilder = AggregationBuilders.terms("source").field("source").size(10000);
         // query
         BoolQueryBuilder query = yuqingAnalyzeQuery(dto);
-                // 过滤微博
+        // 过滤微博
         query.mustNot(QueryBuilders.termQuery("platform_id", "5d02236e6395002a7c380b79"));
         SearchResponse searchResponse;
         // 单独处理buckets超过上限异常，出错时按时间分段查询
@@ -2876,11 +2876,11 @@ public class MarkDataServiceImpl implements MarkDataService {
             if (Objects.nonNull(negativeSpreadTendency.getLeft()) || Objects.nonNull(spreadTendency.getLeft()) || Objects.nonNull(positiveSpreadTendency.getLeft())) {
                 CompletableFuture.allOf(Stream.of(spreadTendency.getLeft(), negativeSpreadTendency.getLeft(), positiveSpreadTendency.getLeft())
                         .filter(Objects::nonNull).map(aggTitle -> CompletableFuture.runAsync(() -> {
-                    try {
-                        baseMaps.put(aggTitle, getAnalyzeFirstArticle(dto, aggTitle));
-                    } catch (IOException ignored) {
-                    }
-                }, executor)).toArray(CompletableFuture[]::new)).join();
+                            try {
+                                baseMaps.put(aggTitle, getAnalyzeFirstArticle(dto, aggTitle));
+                            } catch (IOException ignored) {
+                            }
+                        }, executor)).toArray(CompletableFuture[]::new)).join();
             }
             // 标题为空，但趋势图不为空，此时说明最高点的时间段发文平台全为微博，此时取最高点时间段内时间最早的微博发文
             if (Objects.isNull(spreadTendency.getLeft()) && CollectionUtils.isNotEmpty(spreadTendency.getRight())){
@@ -4113,7 +4113,7 @@ public class MarkDataServiceImpl implements MarkDataService {
                     project.getContendList().forEach(contend -> brandStr.append("、").append(contend.getBrandName()));
                 }
                 questionPair = standardRequest(question, modelName, MessageFormat.format(QUESTION_PROMPT, brandStr));
-                if (Objects.isNull(questionPair) || Objects.equals("无法回答", questionPair.getLeft())) {
+                if (Objects.isNull(questionPair) || Objects.equals("无法回答", questionPair.getLeft().trim())) {
                     return null;
                 }
                 JSONObject json = JSON.parseObject(questionPair.getLeft());