定制舆情分析视频图文区分逻辑调整

src/main/java/com/zhiwei/brandkbs2/pojo/dto/MarkSearchDTO.java

@@ -228,4 +228,9 @@ public class MarkSearchDTO {
      */
     @ApiModelProperty(value = "聚合标题")
     private String aggTitle;
+    /**
+     * 定制舆情分析数据类型 视频/图文
+     */
+    @ApiModelProperty(value = "数据类型：视频/图文")
+    private Boolean isVideo;
 }

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

@@ -3081,7 +3081,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             long total = getYuqingAnalyzeCount(dto, null);
             jsonObject.put("total", total);
             // 视频舆情总量
-            dto.setDataType(Collections.singletonList(5));
+            dto.setIsVideo(true);
             long videoTotal = getYuqingAnalyzeCount(dto, null);
             jsonObject.put("videoTotal", videoTotal);
             // 图文舆情总量
@@ -3154,12 +3154,12 @@ public class MarkDataServiceImpl implements MarkDataService {
             // 负面趋势图
             Pair<String, List<LineVO>> negativeSpreadTendency = getEmotionSpreadTendency(dto, EmotionEnum.NEGATIVE.getName());
             // 视频趋势图
-            dto.setDataType(Collections.singletonList(5));
+            dto.setIsVideo(true);
             Pair<String, List<LineVO>> videoSpreadTendency = getEmotionSpreadTendency(dto, null);
             // 图文趋势图
-            dto.setDataType(Arrays.asList(1, 2, 3));
+            dto.setIsVideo(false);
             Pair<String, List<LineVO>> textSpreadTendency = getEmotionSpreadTendency(dto, null);
-            dto.setDataType(null);
+            dto.setIsVideo(null);
             Map<String, BaseMap> baseMaps = new HashMap<>(2);
             if (Objects.nonNull(negativeSpreadTendency.getLeft()) || Objects.nonNull(spreadTendency.getLeft())) {
                 CompletableFuture.allOf(Stream.of(spreadTendency.getLeft(), negativeSpreadTendency.getLeft())
@@ -4207,6 +4207,14 @@ public class MarkDataServiceImpl implements MarkDataService {
             String planKeyword = xiaohongshuWordDao.findOneById(dto.getCustomPlanId()).getKeyword();
             postFilter.must(EsQueryTools.assembleNormalKeywordQuery(planKeyword, new String[]{GenericAttribute.ES_IND_FULL_TEXT}));
         }
+        // 视频/图文
+        if (Objects.nonNull(dto.getIsVideo())){
+            if (dto.getIsVideo()){
+                postFilter.must(QueryBuilders.existsQuery(GenericAttribute.ES_VIDEO_URLS));
+            }else {
+                postFilter.mustNot(QueryBuilders.existsQuery(GenericAttribute.ES_VIDEO_URLS));
+            }
+        }
         return postFilter;
     }