From b1c917a344e6240a013d0c0fc0a67e3de02afb7e Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期日, 13 七月 2025 23:15:27 +0800
Subject: [PATCH] 修改状态
---
src/main/java/com/linghu/controller/CollectController.java | 608 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 505 insertions(+), 103 deletions(-)
diff --git a/src/main/java/com/linghu/controller/CollectController.java b/src/main/java/com/linghu/controller/CollectController.java
index 3d87085..f435bea 100644
--- a/src/main/java/com/linghu/controller/CollectController.java
+++ b/src/main/java/com/linghu/controller/CollectController.java
@@ -4,6 +4,8 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@@ -16,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.dao.DuplicateKeyException;
import org.springframework.http.*;
import org.springframework.web.reactive.function.client.WebClient;
@@ -27,6 +30,7 @@
import io.jsonwebtoken.lang.Collections;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.web.bind.annotation.* ;
@@ -66,8 +70,14 @@
private UserService userService;
@Autowired
private OrderService orderService;
- private static final Queue<SearchTaskRequest> taskQueue = new LinkedList<>();
+
+ // 替换为线程安全队列
+ private static final Queue<SearchTaskRequest> taskQueue = new ConcurrentLinkedQueue<>();
+ // 全局映射：关键词ID -> 批次队列
+ private static final ConcurrentMap<Integer, Queue<List<UserDto>>> batchQueues = new ConcurrentHashMap<>();
+
private static boolean isProcessing = false;
+
@PostMapping("/search")
@ApiOperation(value = "开始采集")
public Mono<ResponseResult<?>> createSearchTask(
@@ -126,8 +136,25 @@
.subscribe();
}
}
-
private Mono<ResponseResult<String>> executeBatchTask(SearchTaskRequest searchTaskRequest) {
+ Integer keywordId = searchTaskRequest.getKeyword_id();
+ // ... 原有逻辑 ...
+ int maxConcurrentUsers = searchTaskRequest.getConfig() != null ?
+ searchTaskRequest.getConfig().getMax_concurrent_users() : 3;
+ List<List<UserDto>> userBatches = splitUsersIntoBatches(searchTaskRequest.getUsers(), maxConcurrentUsers, keywordId);
+
+
+ // 创建批次队列并存入全局映射
+ Queue<List<UserDto>> batchQueue = new ConcurrentLinkedQueue<>(userBatches);
+ batchQueues.put(keywordId, batchQueue); // 存储到全局映射
+
+ return Mono.just(ResponseResult.success("第一个批次已开始"))
+ .doOnTerminate(() -> {
+ executeBatchTask(batchQueue, searchTaskRequest, keywordId)
+ .subscribe();
+ });
+ }
+/* private Mono<ResponseResult<String>> executeBatchTask(SearchTaskRequest searchTaskRequest) {
log.info("开始处理任务：{}", searchTaskRequest);
log.info("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
Integer keywordId = searchTaskRequest.getKeyword_id();
@@ -143,11 +170,16 @@
executeBatchTask(batchQueue, searchTaskRequest, keywordId)
.subscribe(); // 使用subscribe()启动后台任务
});
- }
+ }*/
private Mono<ResponseResult<?>> executeBatchTask(Queue<List<UserDto>> batchQueue, SearchTaskRequest searchTaskRequest, Integer keywordId) {
// 如果队列为空，说明所有批次已经完成
- if (batchQueue.isEmpty()) {
+// if (batchQueue.isEmpty()) {
+// return Mono.just(ResponseResult.success("所有批次已完成"));
+// }
+ if (batchQueue == null || batchQueue.isEmpty()) {
+ // 清理资源
+ batchQueues.remove(keywordId);
return Mono.just(ResponseResult.success("所有批次已完成"));
}
@@ -163,41 +195,51 @@
return createSingleBatchTask(batchRequest)
.flatMap(taskResponse -> {
if (taskResponse != null && taskResponse.getTask_id() != null) {
- // 保存任务关联到数据库
- return saveKeywordTasks(keywordId, taskResponse)
- .then(waitForTaskCompletion(taskResponse.getTask_id(), batchQueue, searchTaskRequest, keywordId));
+ // 直接等待任务完成，不再保存任务关联信息
+ return waitForTaskCompletion(taskResponse.getTask_id(), batchQueue, searchTaskRequest, keywordId);
} else {
return Mono.just(ResponseResult.error("创建批次任务失败"));
+ }
+ })
+ .doFinally(signal -> {
+ // 任务完成时清理资源
+ if (batchQueue.isEmpty()) {
+ batchQueues.remove(keywordId);
}
});
}
- private Mono<Void> saveKeywordTasks(Integer keywordId, SearchTaskResponse taskResponse) {
- if (taskResponse == null || taskResponse.getTask_id() == null) {
- return Mono.error(new RuntimeException("任务响应无效或任务ID为空"));
- }
-
- KeywordTask keywordTask = new KeywordTask();
- keywordTask.setKeyword_id(keywordId);
- keywordTask.setTask_id(taskResponse.getTask_id());
- keywordTask.setStatus("pending");
-
- // 将 MyBatis-Plus 的同步方法包装为 Mono<Void>
- return Mono.fromRunnable(() -> {
- boolean success = keywordTaskService.saveOrUpdate(keywordTask);
- if (!success) {
- throw new RuntimeException("保存关键词任务关联失败");
- }
- })
- .doFinally(signalType -> log.info("成功保存关键词任务关联: Task ID {}", taskResponse.getTask_id()))
- .then();
- }
+// private Mono<Void> saveKeywordTasks(Integer keywordId, SearchTaskResponse taskResponse) {
+// if (taskResponse == null || taskResponse.getTask_id() == null) {
+// return Mono.error(new RuntimeException("任务响应无效或任务ID为空"));
+// }
+//
+// KeywordTask keywordTask = new KeywordTask();
+// keywordTask.setKeyword_id(keywordId);
+// keywordTask.setTask_id(taskResponse.getTask_id());
+// keywordTask.setStatus("pending");
+//
+// // 将 MyBatis-Plus 的同步方法包装为 Mono<Void>
+// return Mono.fromRunnable(() -> {
+// boolean success = keywordTaskService.saveOrUpdate(keywordTask);
+// if (!success) {
+// throw new RuntimeException("保存关键词任务关联失败");
+// }
+// })
+// .doFinally(signalType -> log.info("成功保存关键词任务关联: Task ID {}", taskResponse.getTask_id()))
+// .then();
+// }
private Mono<ResponseResult<?>> waitForTaskCompletion(String taskId, Queue<List<UserDto>> batchQueue, SearchTaskRequest searchTaskRequest, Integer keywordId) {
// 查询任务状态
return getTaskStatus(taskId)
.flatMap(statusResponse -> {
+ // 检查任务是否被取消
+ if ("cancelled".equalsIgnoreCase(statusResponse.getStatus())) {
+ batchQueues.remove(keywordId); // 清理资源
+ return Mono.just(ResponseResult.success("任务已被取消"));
+ }
// 如果任务状态是"submitted"或"running"，继续轮询
- if ("submitted".equalsIgnoreCase(statusResponse.getStatus()) || "running".equalsIgnoreCase(statusResponse.getStatus())) {
+ if (!"completed".equalsIgnoreCase(statusResponse.getStatus()) && !"failed".equalsIgnoreCase(statusResponse.getStatus()) && !"cancelled".equalsIgnoreCase(statusResponse.getStatus()) ) {
return Mono.delay(Duration.ofSeconds(5)) // 延迟 5 秒后再次查询
.flatMap(aLong -> waitForTaskCompletion(taskId, batchQueue, searchTaskRequest, keywordId)); // 递归调用继续等待
} else {
@@ -338,7 +380,19 @@
List<List<UserDto>> batches = new ArrayList<>();
for (int i = 0; i < users.size(); i += batchSize) {
batches.add(users.subList(i, Math.min(i + batchSize, users.size())));
+
}
+ for (int i = 0; i < batches.size(); i++){
+ // 创建 KeywordTask 关联，task_id 设置为 null，表示任务尚未开始
+ KeywordTask keywordTask = new KeywordTask();
+ keywordTask.setKeyword_id(keywordId);
+ keywordTask.setTask_id(null); // 任务ID为空
+
+ keywordTask.setNum(keyword.getNum());// 任务初始状态为 pending
+ keywordTaskService.save(keywordTask); // 保存 KeywordTask
+ }
+
+
return batches;
}
@@ -356,6 +410,8 @@
// 使用 Reactor 的方式更新数据库
return Mono.fromRunnable(() -> {
+
+ //更新关键词状态
LambdaUpdateWrapper<Keyword> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Keyword::getKeyword_id, batchRequest.getKeyword_id());
updateWrapper.set(Keyword::getStatus, "submitted");
@@ -363,15 +419,40 @@
keywordService.update(updateWrapper);
//设置轮数
Keyword keyword = keywordService.getById(batchRequest.getKeyword_id());
+ // 更新关键词任务与任务ID的关联
+ // 获取与关键词相关的任务，task_id 为 null，确保只取一个任务
+ List<KeywordTask> keywordTasks = keywordTaskService.list(new LambdaQueryWrapper<KeywordTask>()
+ .eq(KeywordTask::getKeyword_id, keyword.getKeyword_id())
+ .isNull(KeywordTask::getTask_id));
+ if (keywordTasks.size() > 0) {
+ KeywordTask keywordTask = keywordTasks.get(0);
+ keywordTask.setTask_id(taskResponse.getTask_id());
+ keywordTask.setStatus("pending");
+ keywordTaskService.updateById(keywordTask);
+ }
+// KeywordTask taskToUpdate = keywordTaskService.getOne(new LambdaQueryWrapper<KeywordTask>()
+// .eq(KeywordTask::getKeyword_id, keyword.getKeyword_id())
+// .eq(KeywordTask::getTask_id, null)); // 确保 task_id 为 null 的任务
- //设置订单进入采集状态
- LambdaUpdateWrapper<Orders> updateOrderWrapper = new LambdaUpdateWrapper<>();
- updateOrderWrapper.eq(Orders::getOrder_id, keyword.getOrder_id()) // 确保字段名正确
- .set(Orders::getStatus, 2); // 直接设置状态值
+ // 更新任务的 task_id 和状态
+// taskToUpdate.setTask_id(taskResponse.getTask_id());
+// taskToUpdate.setStatus("submitted");
+// keywordTaskService.updateById(taskToUpdate);
- boolean success = orderService.update(updateOrderWrapper);
- log.info("订单状态更新结果: {}", success ? "成功" : "失败");
+ //所有关键词都在采集中或者已完成或者错误设置订单进入采集状态
+ List<Keyword> orderKeywords = keywordService.list(new LambdaQueryWrapper<Keyword>()
+ .eq(Keyword::getOrder_id, keyword.getOrder_id()));
+ if (!orderKeywords.isEmpty() && orderKeywords.stream().allMatch(k ->
+ "completed".equals(k.getStatus()) || "submitted".equals(k.getStatus())
+ )) {
+ Orders orders = orderService.getById(keyword.getOrder_id());
+ if (orders != null) {
+ orders.setStatus(2);
+ orderService.updateById(orders);
+
+ }
+ }
}).subscribeOn(Schedulers.boundedElastic()) // 在弹性线程池执行
.thenReturn(taskResponse);
}
@@ -420,54 +501,235 @@
// return Mono.just(errorResponse);
// });
// }
-
- @PostMapping("/cancel/{taskId}")
+ @PostMapping("/cancel/{keywordId}")
@ApiOperation(value = "取消任务")
- public Mono<ResponseResult<TaskCancelResponse>> cancelTask(@PathVariable String taskId) {
- return webClient.post()
- .uri(baseUrl + "/api/v1/tasks/" + taskId + "/cancel")
- .contentType(MediaType.APPLICATION_JSON)
- .bodyValue(Collections.emptyMap()) // 添加空请求体
- .retrieve()
- .onStatus(HttpStatus::isError, response -> response.bodyToMono(TaskCancelResponse.class)
- .flatMap(errorBody -> Mono.error(new RuntimeException(errorBody.getDetail()))))
- .bodyToMono(TaskCancelResponse.class)
- .flatMap(cancelResponse -> {
- // 更新关键词状态
- Mono<Void> updateKeyword = Mono.fromRunnable(() -> {
- LambdaUpdateWrapper<Keyword> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(Keyword::getTask_id, taskId);
- updateWrapper.set(Keyword::getStatus, "canceled"); // 统一使用"canceled"
- keywordService.update(updateWrapper);
- })
- .subscribeOn(Schedulers.boundedElastic())
- .then();
+ public Mono<ResponseResult<TaskCancelResponse>> cancelTask(@PathVariable Integer keywordId) {
+ // 1. 从主队列移除任务
+ List<SearchTaskRequest> removedMainQueueTasks = removeTasksFromQueueByKeywordId(keywordId);
+ int removedMainQueueCount = removedMainQueueTasks.size(); // 获取移除的任务数量
- // 更新关键词任务状态
- Mono<Void> updateKeywordTask = Mono.fromRunnable(() -> {
- LambdaUpdateWrapper<KeywordTask> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(KeywordTask::getTask_id, taskId);
- updateWrapper.set(KeywordTask::getStatus, "canceled"); // 统一使用"canceled"
- keywordTaskService.update(updateWrapper);
- })
- .subscribeOn(Schedulers.boundedElastic())
- .then();
+ // 2. 从批次队列移除任务 (新增逻辑)
+ int removedBatchQueue = removeBatchTasksByKeywordId(keywordId);
- // 并行执行两个更新操作，并在完成后返回cancelResponse
- return Mono.when(updateKeyword, updateKeywordTask)
- .thenReturn(cancelResponse);
- })
- .map(data -> ResponseResult.success(data))
- .onErrorResume(e -> {
- if (e.getMessage().contains("任务不存在")) {
- return Mono.just(ResponseResult.error(200, e.getMessage()));
- } else if (e.getMessage().contains("无法取消")) {
- return Mono.just(ResponseResult.error(200, e.getMessage()));
- }
- return Mono.just(ResponseResult.error(500, e.getMessage()));
+ // 3. 查询所有与关键词相关的任务
+ List<KeywordTask> tasks = keywordTaskService.list(
+ new LambdaQueryWrapper<KeywordTask>().eq(KeywordTask::getKeyword_id, keywordId)
+ );
+
+ // 4. 筛选出需要远程取消的任务
+ List<KeywordTask> tasksToCancelRemotely = tasks.stream()
+ .filter(task -> task.getTask_id() != null && "pending".equalsIgnoreCase(task.getStatus()))
+ .collect(Collectors.toList());
+
+ return Flux.fromIterable(tasksToCancelRemotely)
+ .flatMap(task -> {
+ // 创建状态更新和远程取消的组合操作
+ Mono<Void> updateStatus = updateTaskStatus(task.getTask_id(), "canceled");
+ Mono<ResponseResult<?>> cancelOp = cancelRemoteTask(task.getTask_id())
+ .onErrorResume(e -> {
+ log.error("取消任务 {} 失败: {}", task.getTask_id(), e.getMessage());
+ return Mono.just(ResponseResult.error("取消任务失败: " + e.getMessage()));
+ });
+
+ return Mono.zip(cancelOp, updateStatus)
+ .thenReturn(true);
+ }, 10)
+ .collectList()
+ .flatMap(canceledTasks -> {
+ return updateKeywordAndOrderStatus(keywordId)
+ .thenReturn(ResponseResult.success(
+ new TaskCancelResponse(
+ String.format("任务已取消: 主队列移除%d, 批次队列移除%d, 远程取消%d",
+ removedMainQueueCount ,
+ removedBatchQueue,
+ tasksToCancelRemotely.size())
+ )
+ ));
});
}
+ // 新增方法：移除批次队列
+ private int removeBatchTasksByKeywordId(Integer keywordId) {
+ Queue<List<UserDto>> batchQueue = batchQueues.remove(keywordId);
+ if (batchQueue != null) {
+ int count = batchQueue.size();
+ batchQueue.clear();
+ log.info("从批次队列中移除关键词 {} 的 {} 个批次任务", keywordId, count);
+ return count;
+ }
+ return 0;
+ }
+ // 辅助方法：获取待取消任务
+ private List<KeywordTask> getTasksToCancel(Integer keywordId) {
+ return keywordTaskService.list(
+ new LambdaQueryWrapper<KeywordTask>()
+ .eq(KeywordTask::getKeyword_id, keywordId)
+ .isNotNull(KeywordTask::getTask_id)
+ .eq(KeywordTask::getStatus, "pending")
+ );
+ }
+ /* @PostMapping("/cancel/{keywordId}")
+ @ApiOperation(value = "取消任务")
+ public Mono<ResponseResult<TaskCancelResponse>> cancelTask(@PathVariable Integer keywordId) {
+ // 1. 查询所有与关键词相关的任务
+ List<KeywordTask> tasks = keywordTaskService.list(
+ new LambdaQueryWrapper<KeywordTask>().eq(KeywordTask::getKeyword_id, keywordId)
+ );
+
+ // 2. 从队列中移除所有相关任务（使用锁保证线程安全）
+ List<SearchTaskRequest> removedQueueTasks = removeTasksFromQueueByKeywordId(keywordId);
+
+ // 3. 筛选出需要远程取消的任务
+ List<KeywordTask> tasksToCancelRemotely = tasks.stream()
+ .filter(task -> task.getTask_id() != null && "pending".equalsIgnoreCase(task.getStatus()))
+ .collect(Collectors.toList());
+
+ // 4. 对筛选出的任务发送远程取消请求（并行执行）
+ return Flux.fromIterable(tasksToCancelRemotely)
+ .flatMap(task -> {
+ // 创建状态更新和远程取消的组合操作
+ Mono<Void> updateStatus = updateTaskStatus(task.getTask_id(), "canceled");
+ Mono<ResponseResult<?>> cancelOp = cancelRemoteTask(task.getTask_id())
+ .onErrorResume(e -> {
+ log.error("取消任务 {} 失败: {}", task.getTask_id(), e.getMessage());
+ return Mono.just(ResponseResult.error("取消任务失败: " + e.getMessage()));
+ });
+
+ // 合并操作：无论远程取消是否成功，都更新状态
+ return Mono.zip(cancelOp, updateStatus)
+ .thenReturn(true);
+ }, 10) // 设置10的并发度
+ .collectList()
+ .flatMap(canceledTasks -> {
+ // 5. 更新关键词和订单状态
+ return updateKeywordAndOrderStatus(keywordId)
+ .thenReturn(ResponseResult.success(
+ new TaskCancelResponse(
+ String.format("关键词任务已取消，队列中移除 %d 个任务，远程取消 %d 个任务",
+ removedQueueTasks.size(),
+ tasksToCancelRemotely.size())
+ )
+ ));
+ })
+ .onErrorResume(e -> {
+ log.error("取消关键词任务失败: {}", e.getMessage());
+ return Mono.just(ResponseResult.error(500, "取消关键词任务失败: " + e.getMessage()));
+ });
+ }*/
+ // 提取关键词和订单状态更新的逻辑为单独方法
+ private Mono<Void> updateKeywordAndOrderStatus(Integer keywordId) {
+ return Mono.fromRunnable(() -> {
+ try {
+ // 查询关键词
+ Keyword keyword = keywordService.getById(keywordId);
+ if (keyword == null) {
+ log.warn("未找到关键词，keywordId: {}", keywordId);
+ return;
+ }
+
+ //把任务id为空的删除
+ LambdaUpdateWrapper<KeywordTask> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(KeywordTask::getKeyword_id, keywordId);
+ updateWrapper.isNull(KeywordTask::getTask_id);
+ keywordTaskService.remove(updateWrapper);
+ // 查询该关键词下的所有任务
+ LambdaQueryWrapper<KeywordTask> keywordTaskWrapper = new LambdaQueryWrapper<>();
+ keywordTaskWrapper.eq(KeywordTask::getKeyword_id, keywordId);
+
+ List<KeywordTask> keywordTasks = keywordTaskService.list(keywordTaskWrapper);
+
+ // 更新关键词状态
+// if (keywordTasks.stream().allMatch(task ->
+// "completed".equals(task.getStatus()) || "false".equals(task.getStatus()) || "canceled".equals(task.getStatus())
+// )) {
+ keyword.setStatus("canceled");
+ keywordService.updateById(keyword);
+// log.info("关键词 {} 所有任务已完成，更新状态为 completed", keywordId);
+// }
+ //更新提问词状态为取消
+
+ questionService.update(new LambdaUpdateWrapper<Question>().eq(Question::getKeyword_id, keywordId).set(Question::getStatus, "canceled"));
+
+ // 更新订单状态
+ String orderId = keyword.getOrder_id();
+ if (orderId != null && !orderId.isEmpty()) {
+ // 查询订单下所有关键词
+ LambdaQueryWrapper<Keyword> orderKeywordsWrapper = new LambdaQueryWrapper<>();
+ orderKeywordsWrapper.eq(Keyword::getOrder_id, orderId);
+ List<Keyword> orderKeywords = keywordService.list(orderKeywordsWrapper);
+
+ // 所有关键词均已完成，则更新订单状态为3
+ if (!orderKeywords.isEmpty() && orderKeywords.stream().allMatch(k ->
+ "completed".equals(k.getStatus()) || "false".equals(k.getStatus())
+ )) {
+ Orders orders = orderService.getById(orderId);
+ if (orders != null) {
+ orders.setStatus(3);
+ orderService.updateById(orders);
+ log.info("订单 {} 所有关键词已完成，更新状态为3", orderId);
+ }
+ }
+ if (!orderKeywords.isEmpty() && orderKeywords.stream().allMatch(k ->
+ !"completed".equals(k.getStatus()) || "false".equals(k.getStatus()) || "canceled".equals(k.getStatus())
+ )) {
+ Orders orders = orderService.getById(orderId);
+ if (orders != null) {
+ orders.setStatus(1);
+ orderService.updateById(orders);
+ log.info("订单 {} 所有关键词已完成或者取消，更新状态为1", orderId);
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("更新关键词和订单状态失败: {}", e.getMessage(), e);
+ }
+ });
+ }
+private List<SearchTaskRequest> removeTasksFromQueueByKeywordId(Integer keywordId) {
+ List<SearchTaskRequest> removedTasks = new ArrayList<>();
+
+ Iterator<SearchTaskRequest> iterator = taskQueue.iterator();
+ while (iterator.hasNext()) {
+ SearchTaskRequest task = iterator.next();
+ if (task.getKeyword_id() != null && task.getKeyword_id().equals(keywordId)) {
+ removedTasks.add(task);
+ iterator.remove();
+ }
+ }
+
+
+ log.info("从队列中移除了 {} 个与关键词ID {} 相关的任务", removedTasks.size(), keywordId);
+ return removedTasks;
+}
+
+
+ // 发送远程取消请求
+// 发送远程取消请求（使用Java 8兼容的Map创建方式）
+ private Mono<ResponseResult<?>> cancelRemoteTask(String taskId) {
+ // 使用Collections.singletonMap或手动创建Map
+ Map<String, Object> requestBody = new HashMap<>();
+ requestBody.put("status", "pending");
+
+ return webClient.post()
+ .uri(baseUrl + "/api/v1/tasks/" + taskId + "/cancel")
+ .contentType(MediaType.APPLICATION_JSON)
+ .bodyValue(requestBody)
+ .retrieve()
+ .onStatus(HttpStatus::isError, response -> response.bodyToMono(String.class)
+ .flatMap(errorBody -> Mono.error(new RuntimeException("取消失败: " + errorBody))))
+ .bodyToMono(Void.class)
+ .thenReturn(ResponseResult.success("任务已取消"));
+ }
+
+ // 更新单个任务状态
+ private Mono<Void> updateTaskStatus(String taskId, String status) {
+ return Mono.fromRunnable(() -> {
+ LambdaUpdateWrapper<KeywordTask> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(KeywordTask::getTask_id, taskId);
+ updateWrapper.set(KeywordTask::getStatus, status);
+ keywordTaskService.update(updateWrapper);
+ }).subscribeOn(Schedulers.boundedElastic()).then();
+ }
@ApiOperation(value = "获取任务结果")
@GetMapping("/tasks/{taskId}")
public Mono<TaskResultResponse> getTaskResult(@PathVariable String taskId) {
@@ -488,6 +750,7 @@
.bodyToMono(TaskResultResponse.class)
.flatMap(responseResult -> {
TaskResultResponse result = responseResult;
+
if (result != null && result.getResults() != null) {
return updateQuestionAndReference(result)
.thenReturn(responseResult);
@@ -496,9 +759,6 @@
})
.onErrorResume(e -> {
System.out.println("获取任务结果失败");
- if (e.getMessage().contains("登陆失败")){
-
- }
TaskResultResponse result = new TaskResultResponse();
result.setDetail("获取任务结果失败: " + e.getMessage());
return Mono.just(result);
@@ -570,7 +830,50 @@
// }
// });
// }
+ /**
+ * 获取或创建平台（确保同一domain只创建一次）
+ * @param domain 平台域名
+ * @return 已存在或新创建的Platform
+ */
+ private Platform getOrCreatePlatform(String domain) {
+ // 1. 先尝试查询已存在的平台
+ Platform platform = platformService.getPlatformByDomain(domain);
+ if (platform != null) {
+ return platform;
+ }
+ // 2. 若不存在，尝试创建（处理并发场景）
+ try {
+ // 2.1 获取或创建“默认”类型（Type也需避免重复，建议Type表的type_name也加唯一约束）
+ Type defaultType = typeService.getOne(new LambdaQueryWrapper<Type>()
+ .eq(Type::getType_name, "默认"));
+ if (defaultType == null) {
+ defaultType = new Type();
+ defaultType.setType_name("默认");
+ typeService.save(defaultType); // 若Type可能重复，此处也需处理DuplicateKeyException
+ }
+
+ // 2.2 构建新平台对象
+ Platform newPlatform = new Platform();
+ newPlatform.setDomain(domain);
+ newPlatform.setPlatform_name(domain); // 平台名称默认使用域名，可根据实际需求调整
+ newPlatform.setType_id(defaultType.getType_id());
+ newPlatform.setCreate_time(LocalDateTime.now()); // 补充创建时间
+
+ // 2.3 尝试保存，若因唯一约束冲突失败，则捕获异常
+ platformService.save(newPlatform);
+ return newPlatform; // 保存成功，返回新创建的平台
+
+ } catch (DuplicateKeyException e) {
+ // 3. 若捕获到重复键异常，说明并发创建了，重新查询即可（此时数据库中已存在该平台）
+ log.warn("平台domain={}已存在，无需重复创建", domain, e);
+ return platformService.getPlatformByDomain(domain); // 重新查询，一定能获取到
+ } catch (Exception e) {
+ // 处理其他异常（如数据库连接失败等）
+ log.error("创建平台失败，domain={}", domain, e);
+ throw new RuntimeException("创建平台失败", e);
+ }
+ }
private Mono<Void> updateQuestionAndReference(TaskResultResponse result) {
return Mono.fromRunnable(() -> {
try {
@@ -581,7 +884,8 @@
LambdaQueryWrapper<KeywordTask> keywordTaskWrapper = new LambdaQueryWrapper<>();
keywordTaskWrapper.eq(KeywordTask::getTask_id, result.getTask_id());
KeywordTask keywordTask = keywordTaskService.getOne(keywordTaskWrapper);
-
+ keywordTask.setStatus("completed");
+ keywordTaskService.updateById(keywordTask);
Keyword keyword = keywordService.getById(keywordTask.getKeyword_id());
if (keyword == null) {
@@ -594,23 +898,37 @@
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);
+ //如果全部为completed 关键词也为completed ，如果关联关系没有任务id，或者状态为running ，关键词为submitted，
+ if (keywordTasks.stream().allMatch(task -> "completed".equals(task.getStatus()) || "false".equals(task.getStatus()) || "canceled".equals(task.getStatus())) ) {
+ keyword.setStatus("completed");
keywordService.updateById(keyword);
+
+ }
+ //如果有一个task为failed设置关键词为false
+// else if (keywordTasks.stream().anyMatch(task -> "failed".equals(task.getStatus()))) {
+// keyword.setStatus("false");
+// keywordService.updateById(keyword);
+// }
+
+
+
+//
+//// 定义状态优先级：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
+// }
+// }
+// 更新关键词状态
+
String orderId = keyword.getOrder_id();
if (orderId == null || orderId.isEmpty()) {
System.out.println("关键词[" + keyword.getKeyword_id() + "]未关联订单，跳过订单状态更新");
@@ -626,7 +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()));
@@ -642,7 +971,8 @@
System.out.println("未找到订单[" + orderId + "]，无法更新状态");
}
}
- }
+
+
Orders orders = orderService.getById(keyword.getOrder_id());
// 2. 批量查询所有问题
@@ -683,7 +1013,7 @@
questionsToUpdate.add(question);
- List<Reference> references =
+ /* List<Reference> references =
Optional.ofNullable(questionResult.getReferences())
.orElse(Collections.emptyList())
.stream()
@@ -727,8 +1057,64 @@
}
return reference;
})
- .collect(Collectors.toList());
+ .collect(Collectors.toList());*/
+ // 初始化引用列表（避免null）
+ List<Reference> references = new ArrayList<>();
+ List<TaskResultResponse.Reference> originalReferences = questionResult.getReferences();
+ if (originalReferences == null) {
+ originalReferences = Collections.emptyList();
+ }
+ // 遍历原始引用列表，转换为Reference对象
+ for (TaskResultResponse.Reference ref : originalReferences) { // 注意：需将“原引用类型”替换为实际类型（如QuestionResult中的引用类型）
+ Reference reference = new Reference();
+ // 设置基本字段
+ reference.setQuestion_id(question.getQuestion_id());
+ reference.setTitle(ref.getTitle());
+ reference.setUrl(ref.getUrl());
+ reference.setDomain(ref.getDomain());
+ reference.setNum(keyword.getNum());
+ reference.setTask_id(result.getTask_id());
+ reference.setKeyword_id(keyword.getKeyword_id());
+ reference.setCreate_time(LocalDateTime.now());
+
+ /* // 处理平台和类型关联
+ Platform platform = platformService.getPlatformByDomain(reference.getDomain());
+ if (platform == null) {
+ // 平台不存在，创建新平台（类型默认为“默认”）
+ Type type = typeService.getOne(new LambdaQueryWrapper<Type>().eq(Type::getType_name, "默认"));
+ if (type == null) {
+ Type newType = new Type();
+ newType.setType_name("默认");
+ typeService.save(newType);
+ type = newType;
+ }
+ Platform platform1 = new Platform();
+ platform1.setDomain(reference.getDomain());
+ platform1.setPlatform_name(reference.getDomain());
+ platform1.setType_id(type.getType_id());
+ platform1.setCreate_time(LocalDateTime.now());
+ platformService.save(platform1);
+
+ // 关联新平台和类型
+ reference.setType_id(type.getType_id());
+ reference.setPlatform_id(platform1.getPlatform_id());
+ } else {
+ // 平台已存在，直接关联
+ reference.setPlatform_id(platform.getPlatform_id());
+ Type type = typeService.getById(platform.getType_id());
+ if (type != null) {
+ reference.setType_id(type.getType_id());
+ }
+ }
+*/
+ // 关键：使用优化后的方法获取平台，避免重复创建
+ Platform platform = getOrCreatePlatform(ref.getDomain());
+ reference.setPlatform_id(platform.getPlatform_id());
+ reference.setType_id(platform.getType_id()); // 直接从平台获取类型ID，更可靠
+ // 添加到结果列表
+ references.add(reference);
+ }
// 添加到总引用列表
if (!references.isEmpty()) {
allReferences.addAll(references);
@@ -763,18 +1149,18 @@
int repetitionCount = refGroup.size() - 1;
// 3.3 决定最终保留的记录
- Reference recordToSave;
+ Reference recordToSave = new Reference();
if (existingRecord.isPresent()) {
// 使用已有ID的记录并更新重复次数
recordToSave = existingRecord.get();
recordToSave.setRepetition_num(
- (recordToSave.getRepetition_num() == null ? 0 : recordToSave.getRepetition_num())
+ (recordToSave.getRepetition_num() == null ? 1 : recordToSave.getRepetition_num())
+ repetitionCount
);
} else {
// 没有ID记录则取第一条并设置重复次数
recordToSave = refGroup.get(0);
- recordToSave.setRepetition_num(repetitionCount);
+ recordToSave.setRepetition_num(1+repetitionCount);
}
resultList.add(recordToSave);
@@ -786,6 +1172,22 @@
System.out.println("处理问题结果失败: " + e.getMessage());
}
}
+ //更新账号状态
+ if ( "failed".equals(userResult.getStatus())){
+ if (userResult.getError().contains("登录失败")){
+ LambdaUpdateWrapper<User> userWrapper = new LambdaUpdateWrapper<>();
+ userWrapper.eq(User::getUser_email, userResult.getUser_email());
+ userWrapper.set(User::getStatus, "无法登录");
+ userService.update(userWrapper);
+
+ }else if (userResult.getError().contains("信息错误")){
+ LambdaUpdateWrapper<User> userWrapper = new LambdaUpdateWrapper<>();
+ userWrapper.eq(User::getUser_email, userResult.getUser_email());
+ userWrapper.set(User::getStatus, "信息错误");
+ userService.update(userWrapper);
+ }
+ }
+
}
// 4. 批量更新问题
--
Gitblit v1.7.1