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

src/main/java/com/zzsn/event/constant/Constants.java

@@ -107,4 +107,6 @@ public class Constants {
 
     //obs  文件浏览地址 前部分
     public static final String OBS_FILE_PATH_URL_PREFIX = "http://obs.ciglobal.cn/";
+    /**专题模型处理中断缓存*/
+    public static final String SUBJECT_MODEL_DETAIL_BREAK = "SUBJECT_MODEL_DETAIL_BREAK::";
 }

src/main/java/com/zzsn/event/controller/biz/ClbSubjectHitwordsMapController.java

@@ -3,26 +3,23 @@ package com.zzsn.event.controller.biz;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.event.constant.Result;
 import com.zzsn.event.entity.ClbSubjectHitwordsMap;
+import com.zzsn.event.feign.api.RemoteProjectService;
 import com.zzsn.event.service.ClbSubjectHitwordsMapService;
+import com.zzsn.event.vo.InfoDataSearchCondition;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -33,10 +30,13 @@ import java.util.stream.Collectors;
  * @since 2025-04-23
  */
 @RestController
+@Slf4j
 @RequestMapping("/subject/hitwordsMap")
 public class ClbSubjectHitwordsMapController {
     @Autowired
     private ClbSubjectHitwordsMapService clbSubjectHitwordsMapService;
+    @Autowired
+    private RemoteProjectService remoteProjectService;
 
     /**
      * 分页列表查询
@@ -106,6 +106,17 @@ public class ClbSubjectHitwordsMapController {
         }
 
         clbSubjectHitwordsMapService.save(clbSubjectHitwordsMap);
+
+        InfoDataSearchCondition searchCondition = new InfoDataSearchCondition();
+        searchCondition.setSubjectId(clbSubjectHitwordsMap.getSubjectId());
+        searchCondition.setStatus(0);
+        searchCondition.setIsSubject("1");
+        searchCondition.setCategory(1);
+        searchCondition.setFlowId("1914980469431201794");
+        //手动中断正在执行的词频历史处理任务
+        clbSubjectHitwordsMapService.stopTask(searchCondition);
+        String s = remoteProjectService.doTaskByFlow(searchCondition);
+        log.info("调用流程编排接口返回结果：{}",s);
         return Result.OK(clbSubjectHitwordsMap);
     }
 

src/main/java/com/zzsn/event/feign/api/RemoteProjectService.java

+package com.zzsn.event.feign.api;
+
+import com.zzsn.event.vo.InfoDataSearchCondition;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+//feign调用
+@FeignClient(value = "service-project")
+public interface RemoteProjectService {
+
+
+    /**
+     * 清除专题缓存
+     *
+     * @param
+     * @author lkg
+     * @date 2025/2/7
+     */
+    @PostMapping("/manage/subjectModel/doTaskByFlow")
+    String doTaskByFlow(@RequestBody InfoDataSearchCondition task);
+
+
+}

src/main/java/com/zzsn/event/mapper/ClbSubjectHitwordsMapMapper.java

@@ -3,6 +3,9 @@ package com.zzsn.event.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zzsn.event.entity.ClbSubjectHitwordsMap;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ClbSubjectHitwordsMapMapper extends BaseMapper<ClbSubjectHitwordsMap> {
 
+    List<String> detail(@Param("flowId") String flowId, @Param("subjectId")  String subjectId);
 }

src/main/java/com/zzsn/event/mapper/xml/ClbSubjectHitwordsMapMapper.xml

@@ -15,4 +15,9 @@
         <result column="del_flag" property="delFlag" />
     </resultMap>
 
+
+    <select id="detail" resultType="String">
+        SELECT id FROM clb_subject_model_detail_task WHERE subject_id = #{subjectId} AND flow_id = #{flowId} AND task_status in (0,1);
+    </select>
+
 </mapper>

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

@@ -2,6 +2,7 @@ package com.zzsn.event.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zzsn.event.entity.ClbSubjectHitwordsMap;
+import com.zzsn.event.vo.InfoDataSearchCondition;
 
 import java.util.List;
 
@@ -16,4 +17,6 @@ import java.util.List;
 public interface ClbSubjectHitwordsMapService extends IService<ClbSubjectHitwordsMap> {
 
     void delEs(List<ClbSubjectHitwordsMap> clbSubjectHitwordsMaps);
+
+    void stopTask(InfoDataSearchCondition searchCondition);
 }

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

@@ -4,10 +4,12 @@ package com.zzsn.event.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.event.constant.Constants;
 import com.zzsn.event.entity.ClbSubjectHitwordsMap;
 import com.zzsn.event.mapper.ClbSubjectHitwordsMapMapper;
 import com.zzsn.event.service.ClbSubjectHitwordsMapService;
 import com.zzsn.event.service.InformationService;
+import com.zzsn.event.util.RedisUtil;
 import com.zzsn.event.vo.InfoDataSearchCondition;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,8 @@ public class ClbSubjectHitwordsMapServiceImpl extends ServiceImpl<ClbSubjectHitw
 
     @Autowired
     private InformationService informationService;
+    @Autowired
+    RedisUtil redisUtil;
 
     @Override
     public void delEs(List<ClbSubjectHitwordsMap> clbSubjectHitwordsMaps) {
@@ -61,4 +65,16 @@ public class ClbSubjectHitwordsMapServiceImpl extends ServiceImpl<ClbSubjectHitw
         CompletableFuture.runAsync(()-> informationService.removeWordLabel(searchCondition));
 
     }
+
+    @Override
+    public void stopTask(InfoDataSearchCondition searchCondition) {
+        String flowId = searchCondition.getFlowId();
+        String subjectId = searchCondition.getSubjectId();
+        List<String> taskIds = baseMapper.detail(flowId,subjectId);
+        if (CollectionUtil.isNotEmpty(taskIds)) {
+            taskIds.forEach(taskId -> {
+                redisUtil.hset(Constants.SUBJECT_MODEL_DETAIL_BREAK+subjectId,taskId,"1");
+            });
+        }
+    }
 }

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

@@ -188,4 +188,8 @@ public class InfoDataSearchCondition {
     /*-----打标签---start-------------------*/
     private List<Label> markTags;
     /*------打标签---end-------------------*/
+    /**
+     * 本次任务使用的流程id
+     */
+    private String flowId;
 }