根据需求补充接口

src/main/java/com/zzsn/event/controller/common/InformationController.java

@@ -13,11 +13,11 @@ import com.zzsn.event.enums.LabelTypeEnum;
 import com.zzsn.event.es.EsService;
 import com.zzsn.event.service.*;
 import com.zzsn.event.util.PythonUtil;
-import com.zzsn.event.util.tree.Node;
 import com.zzsn.event.util.user.UserUtil;
 import com.zzsn.event.util.user.UserVo;
 import com.zzsn.event.vo.*;
 import com.zzsn.event.vo.es.DisplayInfo;
+import com.zzsn.event.vo.es.Label;
 import com.zzsn.event.vo.es.SpecialInformation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -564,8 +564,9 @@ public class InformationController {
     @PostMapping("/addToFavorites")
     public Result<?> addToFavorites(@RequestBody InfoDataSearchCondition searchCondition) {
         String subjectId = searchCondition.getSubjectId();
-        if (StringUtils.isEmpty(subjectId)) {
-            return Result.FAIL("专题id不能为空");
+        List<String> ids = searchCondition.getIds();
+        if (StringUtils.isEmpty(subjectId) && CollectionUtils.isEmpty(ids)) {
+            return Result.FAIL("专题id和资讯id集合不能同时为空");
         }
         informationService.addToFavorites(searchCondition);
         return Result.OK();
@@ -581,8 +582,9 @@ public class InformationController {
     @PostMapping("/addToPend")
     public Result<?> addToPend(@RequestBody InfoDataSearchCondition searchCondition) {
         String subjectId = searchCondition.getSubjectId();
-        if (StringUtils.isEmpty(subjectId)) {
-            return Result.FAIL("专题id不能为空");
+        List<String> ids = searchCondition.getIds();
+        if (StringUtils.isEmpty(subjectId) && CollectionUtils.isEmpty(ids)) {
+            return Result.FAIL("专题id和资讯id集合不能同时为空");
         }
         informationService.addToPend(searchCondition);
         return Result.OK();
@@ -598,8 +600,9 @@ public class InformationController {
     @PostMapping("/addToRemove")
     public Result<?> addToRemove(@RequestBody InfoDataSearchCondition searchCondition) {
         String subjectId = searchCondition.getSubjectId();
-        if (StringUtils.isEmpty(subjectId)) {
-            return Result.FAIL("专题id不能为空");
+        List<String> ids = searchCondition.getIds();
+        if (StringUtils.isEmpty(subjectId) && CollectionUtils.isEmpty(ids)) {
+            return Result.FAIL("专题id和资讯id集合不能同时为空");
         }
         informationService.addToRemove(searchCondition);
         return Result.OK();
@@ -650,5 +653,49 @@ public class InformationController {
         return Result.OK();
     }
 
+    /**
+     * 资讯批量打标
+     *
+     * @param searchCondition 检索条件
+     * @author lkg
+     * @date 2025/4/23
+     */
+    @PostMapping("/markTag")
+    public Result<?> markTag(@RequestBody InfoDataSearchCondition searchCondition) {
+        String subjectId = searchCondition.getSubjectId();
+        List<String> ids = searchCondition.getIds();
+        if (StringUtils.isEmpty(subjectId) && CollectionUtils.isEmpty(ids)) {
+            return Result.FAIL("专题id和资讯id集合不能同时为空");
+        }
+        List<Label> markTags = searchCondition.getMarkTags();
+        if (CollectionUtils.isEmpty(markTags)) {
+            return Result.FAIL("标签不能为空");
+        }
+        informationService.markTag(searchCondition);
+        return Result.OK();
+    }
+
+    /**
+     * 资讯批量删除标签
+     *
+     * @param searchCondition 检索条件
+     * @author lkg
+     * @date 2025/4/23
+     */
+    @PostMapping("/removeTag")
+    public Result<?> removeTag(@RequestBody InfoDataSearchCondition searchCondition) {
+        String subjectId = searchCondition.getSubjectId();
+        List<String> ids = searchCondition.getIds();
+        if (StringUtils.isEmpty(subjectId) && CollectionUtils.isEmpty(ids)) {
+            return Result.FAIL("专题id和资讯id集合不能同时为空");
+        }
+        List<Label> markTags = searchCondition.getMarkTags();
+        if (CollectionUtils.isEmpty(markTags)) {
+            return Result.FAIL("标签不能为空");
+        }
+        informationService.removeTag(searchCondition);
+        return Result.OK();
+    }
+
 
 }

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

@@ -845,10 +845,10 @@ public class EsService {
                     break;
                 default:
                     NestedSortBuilder nestedWordSortBuilder = new NestedSortBuilder("sortField");
-                    nestedWordSortBuilder.setFilter(QueryBuilders.termQuery("sortField.fieldType", column));
+                    nestedWordSortBuilder.setFilter(QueryBuilders.termsQuery("sortField.fieldType", Arrays.asList(column.split(","))));
                     FieldSortBuilder fieldWordSortBuilder = SortBuilders.fieldSort("sortField.fieldLong")
                             .order(sortOrder)
-                            .sortMode(SortMode.MAX)
+                            .sortMode(SortMode.SUM)
                             .setNestedSort(nestedWordSortBuilder);
                     searchSourceBuilder.sort(fieldWordSortBuilder);
                     break;
@@ -2225,6 +2225,19 @@ public class EsService {
         if (maxScore != null) {
             boolQuery.filter(QueryBuilders.rangeQuery("score").lte(maxScore));
         }
+        //正文长度筛选
+        Integer minContentLength = searchCondition.getMinContentLength();
+        if (minContentLength != null) {
+            NestedQueryBuilder nestedQueryBuilder = QueryBuilders
+                    .nestedQuery("sortField", QueryBuilders.rangeQuery("sortField.fieldLong").gte(minContentLength), ScoreMode.None);
+            boolQuery.filter(nestedQueryBuilder);
+        }
+        Integer maxContentLength = searchCondition.getMaxContentLength();
+        if (maxContentLength != null) {
+            NestedQueryBuilder nestedQueryBuilder = QueryBuilders
+                    .nestedQuery("sortField", QueryBuilders.rangeQuery("sortField.fieldLong").lte(maxContentLength), ScoreMode.None);
+            boolQuery.filter(nestedQueryBuilder);
+        }
         //时间过滤筛选-前端传参
         if (StringUtils.isNotBlank(searchCondition.getStartTime())) {
             boolQuery.filter(QueryBuilders.rangeQuery("publishDate").gte(EsDateUtil.esFieldDateFormat(searchCondition.getStartTime())));

src/main/java/com/zzsn/event/service/InformationService.java

@@ -324,4 +324,22 @@ public interface InformationService {
      * @date 2025/4/23
      */
     void charReplace(InfoDataSearchCondition searchCondition);
+
+    /**
+     * 打标签
+     *
+     * @param searchCondition 资讯检索条件
+     * @author lkg
+     * @date 2025/4/23
+     */
+    void markTag(InfoDataSearchCondition searchCondition);
+
+    /**
+     * 打标签
+     *
+     * @param searchCondition 资讯检索条件
+     * @author lkg
+     * @date 2025/4/23
+     */
+    void removeTag(InfoDataSearchCondition searchCondition);
 }

src/main/java/com/zzsn/event/service/impl/InformationServiceImpl.java

@@ -1274,6 +1274,52 @@ public class InformationServiceImpl implements InformationService {
         esOpUtil.batchReplaceScript(indexArr, buildQuery, modifyFields, oldWord, newWord);
     }
 
+    @Override
+    public void markTag(InfoDataSearchCondition searchCondition) {
+        List<String> subjectIdList = new ArrayList<>();
+        subjectIdList.add(searchCondition.getSubjectId());
+        String minCreateTime = subjectService.getMinCreateTime(subjectIdList);
+        String[] indexArr = EsIndexUtil.getIndexIntervalYearStr(Constants.SUBJECT_INDEX, minCreateTime);
+        List<String> ids = searchCondition.getIds();
+        BoolQueryBuilder buildQuery;
+        if (CollectionUtils.isEmpty(ids)) {
+            buildQuery = esService.buildQuery(searchCondition, subjectIdList);
+        } else {
+            buildQuery = QueryBuilders.boolQuery().must(QueryBuilders.termsQuery("id", ids));
+        }
+        Map<String, Object> addParams = new HashMap<>();
+        for (Label markTag : searchCondition.getMarkTags()) {
+            Map<String, String> addTag = ObjectUtil.objectToMap(markTag);
+            addParams.put("labels",addTag);
+            esOpUtil.batchNestedAddScript(indexArr, buildQuery, addParams,"labels","relationId");
+        }
+    }
+
+    @Override
+    public void removeTag(InfoDataSearchCondition searchCondition) {
+        List<String> subjectIdList = new ArrayList<>();
+        subjectIdList.add(searchCondition.getSubjectId());
+        String minCreateTime = subjectService.getMinCreateTime(subjectIdList);
+        String[] indexArr = EsIndexUtil.getIndexIntervalYearStr(Constants.SUBJECT_INDEX, minCreateTime);
+        List<String> ids = searchCondition.getIds();
+        BoolQueryBuilder buildQuery;
+        if (CollectionUtils.isEmpty(ids)) {
+            buildQuery = esService.buildQuery(searchCondition, subjectIdList);
+        } else {
+            buildQuery = QueryBuilders.boolQuery().must(QueryBuilders.termsQuery("id", ids));
+        }
+        List<Label> markTags = searchCondition.getMarkTags();
+        List<String> tagIds = markTags.stream().map(Label::getRelationId).collect(Collectors.toList());
+        buildQuery.must(QueryBuilders.nestedQuery("labels",
+                QueryBuilders.termsQuery("labels.relationId", tagIds),
+                ScoreMode.None));
+        for (String tagId : tagIds) {
+            Map<String, Object> deleteParams = new HashMap<>();
+            deleteParams.put("relationId", tagId);
+            esOpUtil.batchNestedDeleteScript(indexArr, buildQuery, deleteParams, "labels");
+        }
+    }
+
     private void formatLabel(List<LabelModelVo> labelModelVos, DisplayInfo info) {
         if (CollectionUtils.isNotEmpty(labelModelVos)) {
             List<Label> list = info.getLabels();

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

@@ -76,7 +76,7 @@ public class InfoDataSearchCondition {
     //爬虫类型
     private String crawler;
 
-    //组合标签查询(不同类标签之间是与的关系，同一类标签之间是或的关系)，示例: "a,b;c,d;e,f"
+    //组合标签查询(不同类标签之间是与的关系，同一类标签之间是或的关系)，示例: "a1,a2;c1,c2"
     private String composeSearchLabelIds;
 
     /**----企业类标签筛选----**/
@@ -120,6 +120,12 @@ public class InfoDataSearchCondition {
     //最大得分
     private Integer maxScore;
 
+    //正文长度-研究中心
+    //最小长度
+    private Integer minContentLength;
+    //最大长度
+    private Integer maxContentLength;
+
     //es查询字段数组
     private String[] fetchFields;
     //排除字段数组
@@ -178,4 +184,8 @@ public class InfoDataSearchCondition {
     /*-----字符串替换---start-------------------*/
     private String replaceWord;
     /*------字符串替换---end-------------------*/
+
+    /*-----打标签---start-------------------*/
+    private List<Label> markTags;
+    /*------打标签---end-------------------*/
 }

src/main/java/com/zzsn/event/vo/es/DisplayInfo.java

@@ -44,6 +44,8 @@ public class DisplayInfo {
     private String summaryRaw;
     //关键词
     private String keyWords;
+    //命中词列表
+    private List<String> keyWordsList;
     //标题
     private String title;
     private String titleRaw;