舆情列表新增关联标注标签展示调整

src/main/java/com/zhiwei/brandkbs2/service/MarkFlowService.java

@@ -3,6 +3,7 @@ package com.zhiwei.brandkbs2.service;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.base.entity.subclass.mark.MarkInfo;
 import com.zhiwei.brandkbs2.pojo.MarkFlowEntity;
+import com.zhiwei.brandkbs2.pojo.dto.TagFilterDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -83,10 +84,13 @@ public interface MarkFlowService {
         private String planId;
         private Long gid;
 
-        public MarkInfoSource(JSONObject json, String projectId, String contendId) {
+        private List<TagFilterDTO> tagFilters;
+
+        public MarkInfoSource(JSONObject json, String projectId, String contendId, List<TagFilterDTO> tagFilters) {
             this.json = json;
             this.projectId = projectId;
             this.contendId = contendId;
+            this.tagFilters = tagFilters;
         }
 
         public MarkInfoSource(JSONObject json, String linkedGroupId) {

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

@@ -3293,6 +3293,7 @@ public class MarkDataServiceImpl implements MarkDataService {
     private List<MarkFlowEntity> getMarkFlowEntity(MarkSearchDTO markSearchDTO, SearchHits searchHits) {
         String projectId = markSearchDTO.getProjectId();
         String contendId = markSearchDTO.getContendId();
+        List<TagFilterDTO> tagFilters = tagFilterService.getTagFilter();
         // 重复消息折叠
         if (markSearchDTO.isFold()) {
             // 根据旧顺序排序
@@ -3306,17 +3307,17 @@ public class MarkDataServiceImpl implements MarkDataService {
             return sortList.stream().map(id -> {
                 List<Map<String, Object>> maps = collect.get(id);
                 if (null != maps) {
-                    return MarkFlowEntity.getFoldInstance(maps.stream().map(map -> getMarkFlowEntity(map, projectId, contendId)).collect(Collectors.toList()));
+                    return MarkFlowEntity.getFoldInstance(maps.stream().map(map -> getMarkFlowEntity(map, projectId, contendId, tagFilters)).collect(Collectors.toList()));
                 }
                 return null;
             }).filter(Objects::nonNull).collect(Collectors.toList());
         }
-        return Arrays.stream(searchHits.getHits()).map(hit -> getMarkFlowEntity(hit.getSourceAsMap(), projectId, contendId)).collect(Collectors.toList());
+        return Arrays.stream(searchHits.getHits()).map(hit -> getMarkFlowEntity(hit.getSourceAsMap(), projectId, contendId, tagFilters)).collect(Collectors.toList());
     }
 
-    private MarkFlowEntity getMarkFlowEntity(Map<String, Object> map, String projectId, String contendId) {
+    private MarkFlowEntity getMarkFlowEntity(Map<String, Object> map, String projectId, String contendId, List<TagFilterDTO> tagFilters) {
         MarkFlowEntity instance = new MarkFlowEntity(new JSONObject(map));
-        instance.setInfo(markFlowService.createMarkFlowInfo(new MarkFlowService.MarkInfoSource(new JSONObject(map), projectId, contendId)));
+        instance.setInfo(markFlowService.createMarkFlowInfo(new MarkFlowService.MarkInfoSource(new JSONObject(map), projectId, contendId, tagFilters)));
         return instance;
     }
 
@@ -3386,6 +3387,7 @@ public class MarkDataServiceImpl implements MarkDataService {
         if (null == dto.getAggreeId()) {
             ExceptionCast.cast(CommonCodeEnum.INVALID_PARAM);
         }
+        List<TagFilterDTO> tagFilter = tagFilterService.getTagFilter();
         dto.setProjectId(UserThreadLocal.getProjectId());
         Query query = assembleAggreeQuery(dto);
         // 量查询
@@ -3401,7 +3403,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             List<MarkFlowEntity> markFlowEntities = new ArrayList<>();
             MarkFlowEntity instance = new MarkFlowEntity(aggreeResult.getData(), dto.getLinkedGroupId());
             instance.setInfo(createMarkFlowInfo.create(new MarkFlowService.MarkInfoSource(aggreeResult.getData(), dto.getProjectId(), dto.getContendId(),
-                    dto.getLinkedGroupId(), dto.getPlanId(), dto.getGid())));
+                    dto.getLinkedGroupId(), dto.getPlanId(), dto.getGid(), tagFilter)));
             markFlowEntities.add(instance);
             // 添加父标题集下的子标题集
             resList.add(MarkFlowEntity.getAggreeInstance(markFlowEntities, aggreeResult, sonDetails));

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

@@ -62,12 +62,6 @@ public class MarkFlowServiceImpl implements MarkFlowService {
     @Resource(name = "filterClient")
     UnifiedFilterClient filterClient;
 
-    @Resource(name = "highlightWordDao")
-    HighlightWordDao highlightWordDao;
-
-    @Resource(name = "tagFilterServiceImpl")
-    TagFilterService tagFilterService;
-
     @Override
     public JSONObject createMarkFlowInfo(MarkInfoSource markInfoSource) {
         JSONObject resultInfo = createInfoWithEmotion(markInfoSource.getJson());
@@ -92,7 +86,6 @@ public class MarkFlowServiceImpl implements MarkFlowService {
         JSONObject json = markInfoSource.getJson();
         JSONObject resultInfo = createInfoWithEmotion(json);
         resultInfo.put("sourceDetails", getSourceDetails(markInfoSource));
-        resultInfo.put("customTags", getCustomTagsInfo(markInfoSource));
         String zip = Tools.gzip(JSON.toJSONString(json));
         resultInfo.put("zip", zip);
         // 每条数据高亮词
@@ -217,8 +210,8 @@ public class MarkFlowServiceImpl implements MarkFlowService {
             return null;
         }
         // 已配置的标签筛选
-        List<TagFilterDTO> tagFilter = tagFilterService.getTagFilter();
-        List<String> groupNames = tagFilter.stream().map(TagFilterDTO::getGroupName).collect(Collectors.toList());
+        List<TagFilterDTO> tagFilters = markInfoSource.getTagFilters();
+        List<String> groupNames = tagFilters.stream().map(TagFilterDTO::getGroupName).collect(Collectors.toList());
         for (JSONObject markCacheMap : markCacheMaps) {
             String groupName = markCacheMap.getString("group_name");
             if (!groupNames.contains(groupName) || Objects.equals(Constant.EMOTION_LABEL_KEY, groupName)){