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

src/main/java/com/zzsn/event/controller/SubjectManageController.java

@@ -611,13 +611,10 @@ public class SubjectManageController {
         UserVo loginUser = UserUtil.getLoginUser();
         scoreModelService.addOrUpdate(scoreModelVo, 1);
         //调用接口，重新打分
-        CompletableFuture.runAsync(() -> {
-            String subjectId = scoreModelVo.getSubjectId();
-            HttpHeaders headers = new HttpHeaders();
-            headers.set("loginUser", JSON.toJSONString(loginUser));
-            remoteModelService.reScoreRequest(subjectId, "1887695061047672834", headers);
-            log.info("专题-{}，通用打分配置修改，重新打分请求发送成功", subjectId);
-        });
+        String subjectId = scoreModelVo.getSubjectId();
+        HttpHeaders headers = new HttpHeaders();
+        remoteModelService.reScoreRequest(subjectId, "1887695061047672834", headers);
+        log.info("专题-{}，通用打分配置修改，重新打分请求发送成功", subjectId);
         return Result.OK();
     }
 

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

@@ -30,4 +30,17 @@ public interface RemoteModelService {
      */
     @GetMapping("/modelArrange/clbBiz/delMiddelDataBySubjectId")
     String removeMiddleDataRequest(@RequestParam("subjectId") String subjectId);
+
+
+    /**
+     * 清除专题缓存
+     *
+     * @param subjectId 专题id
+     * @author lkg
+     * @date 2025/2/7
+     */
+    @GetMapping("/modelArrange/clbModelMonitor/delSubjectCache")
+    String delSubjectCache(@RequestParam("subjectId") String subjectId);
+
+
 }

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

@@ -11,6 +11,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zzsn.event.entity.*;
 import com.zzsn.event.enums.BindTypeEnum;
+import com.zzsn.event.feign.api.RemoteModelService;
 import com.zzsn.event.service.*;
 import com.zzsn.event.vo.KeyWordsPage;
 import lombok.extern.slf4j.Slf4j;
@@ -127,7 +128,8 @@ public class ConfigurationMessageService {
     @Value("${caiji.projectName:克虏宝}")
     private String projectName;
 
-
+    @Autowired(required = false)
+    private RemoteModelService remoteModelService;
 
 
     /**
@@ -337,6 +339,11 @@ public class ConfigurationMessageService {
             throw new RuntimeException("专题关键词配置通知采集失败");
         }
         log.info("{}专题关键词配置通知采集结束",byId.getSubjectName());
+        try {
+            remoteModelService.delSubjectCache(subjectId);
+        } catch (Exception e) {
+            log.error("删除专题缓存失败{}",e.getMessage(),e);
+        }
     }
 
 
@@ -367,6 +374,11 @@ public class ConfigurationMessageService {
             throw new RuntimeException("专题信息源配置通知采集失败");
         }
         log.info("{}专题信息源配置通知采集结束",byId.getSubjectName());
+        try {
+            remoteModelService.delSubjectCache(subjectId);
+        } catch (Exception e) {
+            log.error("删除专题缓存失败{}",e.getMessage(),e);
+        }
     }