From e229a5d7c7ca4c3d3353d8ab6e34df2d6ef642ef Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 11 七月 2025 12:24:52 +0800
Subject: [PATCH] 更新

---
 src/main/java/com/linghu/controller/CollectController.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/linghu/controller/CollectController.java b/src/main/java/com/linghu/controller/CollectController.java
index fb6d23f..40aead8 100644
--- a/src/main/java/com/linghu/controller/CollectController.java
+++ b/src/main/java/com/linghu/controller/CollectController.java
@@ -67,6 +67,8 @@
     private PlatformService platformService;
     @Autowired
     private TypeService typeService;
+    @Autowired
+    private UserService userService;
 
 
  /*   @PostMapping("/search")
@@ -446,7 +448,10 @@
                 })
                 .onErrorResume(e -> {
                     System.out.println("获取任务结果失败");
-                    TaskResultResponse result = new TaskResultResponse();
+                    if (e.getMessage().contains("登陆失败")){
+
+                    }
+                        TaskResultResponse result = new TaskResultResponse();
                     result.setDetail("获取任务结果失败: " + e.getMessage());
                     return Mono.just(result);
                 });
@@ -521,6 +526,8 @@
     private Mono<Void> updateQuestionAndReference(TaskResultResponse result) {
         return Mono.fromRunnable(() -> {
             try {
+                //查看每个账号信息的status是否正常
+
                 // 1. 根据KeywordTask更新关键词状态
                 // 查询关键词ID
                 LambdaQueryWrapper<KeywordTask> keywordTaskWrapper = new LambdaQueryWrapper<>();
@@ -535,8 +542,29 @@
                     throw new Exception("未找到关联的关键词,task_id: " + result.getTask_id());
 //                    return;
                 }
-                keyword.setStatus("completed");
-                keywordService.updateById(keyword);
+                LambdaQueryWrapper<KeywordTask> keywordTaskWrapper2 = new LambdaQueryWrapper<>();
+                keywordTaskWrapper2.eq(KeywordTask::getKeyword_id, keyword.getKeyword_id());
+                List<KeywordTask> keywordTasks = keywordTaskService.list(keywordTaskWrapper2);
+
+// 定义状态优先级:canceled > false > completed
+                String finalStatus = "completed"; // 默认状态为 completed
+
+                for (KeywordTask task : keywordTasks) {
+                    String status = task.getStatus();
+                    if ("canceled".equals(status)) {
+                        finalStatus = "canceled";
+                        break; // 遇到 canceled 直接跳出循环,因为优先级最高
+                    } else if ("false".equals(status)) {
+                        finalStatus = "false";
+                        // 不跳出循环,继续检查是否存在 canceled
+                    }
+                }
+
+// 更新关键词状态
+                if (!finalStatus.equals(keyword.getStatus())) {
+                    keyword.setStatus(finalStatus);
+                    keywordService.updateById(keyword);
+                }
 
                 // 2. 批量查询所有问题
                 LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();

--
Gitblit v1.7.1