From 716a8e866af8df060ae2897a890f191174a08d37 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 14 七月 2025 14:43:17 +0800
Subject: [PATCH] 修改取消任务已有数据的提问词状态
---
src/main/java/com/linghu/controller/CollectController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/linghu/controller/CollectController.java b/src/main/java/com/linghu/controller/CollectController.java
index 1ace567..1ad4f89 100644
--- a/src/main/java/com/linghu/controller/CollectController.java
+++ b/src/main/java/com/linghu/controller/CollectController.java
@@ -642,13 +642,13 @@
// if (keywordTasks.stream().allMatch(task ->
// "completed".equals(task.getStatus()) || "false".equals(task.getStatus()) || "canceled".equals(task.getStatus())
// )) {
- keyword.setStatus("canceled");
+// keyword.setStatus("canceled");
keywordService.updateById(keyword);
// log.info("关键词 {} 所有任务已完成，更新状态为 completed", keywordId);
// }
//更新提问词状态为取消
- questionService.update(new LambdaUpdateWrapper<Question>().eq(Question::getKeyword_id, keywordId).set(Question::getStatus, "canceled"));
+ questionService.update(new LambdaUpdateWrapper<Question>().eq(Question::getKeyword_id, keywordId).isNull(Question::getResponse).set(Question::getStatus, "canceled"));
// 更新订单状态
String orderId = keyword.getOrder_id();
@@ -944,6 +944,18 @@
System.out.println("订单[" + orderId + "]下无关键词，跳过状态更新");
return;
}
+ boolean allValid2 = orderKeywords.stream()
+ .allMatch(k -> "completed".equals(k.getStatus()) || "false".equals(k.getStatus()) || "canceled".equals(k.getStatus()));
+ if (allValid2) {
+ Orders orders = orderService.getById(orderId);
+ if (orders != null) {
+ orders.setStatus(1); // 假设Orders有Integer类型的status字段
+ orderService.updateById(orders);
+ System.out.println("订单[" + orderId + "]所有关键词采集完成或者取消，已更新状态为1");
+ } else {
+ System.out.println("未找到订单[" + orderId + "]，无法更新状态");
+ }
+ }
// 3. 检查所有关键词的状态是否均为 completed 或 false
boolean allValid = orderKeywords.stream()
.allMatch(k -> "completed".equals(k.getStatus()) || "false".equals(k.getStatus()));
@@ -959,18 +971,7 @@
System.out.println("未找到订单[" + orderId + "]，无法更新状态");
}
}
- boolean allValid2 = orderKeywords.stream()
- .allMatch(k -> "completed".equals(k.getStatus()) || "false".equals(k.getStatus()) || "canceled".equals(k.getStatus()));
- if (allValid) {
- Orders orders = orderService.getById(orderId);
- if (orders != null) {
- orders.setStatus(1); // 假设Orders有Integer类型的status字段
- orderService.updateById(orders);
- System.out.println("订单[" + orderId + "]所有关键词采集完成或者取消，已更新状态为1");
- } else {
- System.out.println("未找到订单[" + orderId + "]，无法更新状态");
- }
- }
+
Orders orders = orderService.getById(keyword.getOrder_id());
--
Gitblit v1.7.1