From a9e958ce3675c4950ceddd3fd6f939cdf0d2bc5a Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 25 七月 2025 19:00:20 +0800
Subject: [PATCH] 任务不存在时，更新关键词状态,更新创建订单id逻辑
---
src/main/java/com/linghu/controller/CollectController.java | 690 ++++++++++++++++++--------------------------------------
1 files changed, 225 insertions(+), 465 deletions(-)
diff --git a/src/main/java/com/linghu/controller/CollectController.java b/src/main/java/com/linghu/controller/CollectController.java
index 4110880..0da27b4 100644
--- a/src/main/java/com/linghu/controller/CollectController.java
+++ b/src/main/java/com/linghu/controller/CollectController.java
@@ -70,13 +70,16 @@
private UserService userService;
@Autowired
private OrderService orderService;
+ @Autowired
+ private QuestionResultService questionResultService;
// 替换为线程安全队列
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;
+// private static boolean isProcessing = false;
+ private static volatile boolean isProcessing = false; // 添加 volatile
@PostMapping("/search")
@ApiOperation(value = "开始采集")
@@ -91,7 +94,6 @@
double memoryUsage = parseUsage(resourceResponse.getMemory_usage_percent());
if (cpuUsage >= 90.0 || memoryUsage >= 90.0) {
-
String errorMsg = String.format("服务器资源不足,请稍后再试");
@@ -124,24 +126,32 @@
SearchTaskRequest nextTaskRequest = taskQueue.poll();
if (nextTaskRequest != null) {
- // 处理任务
+ Integer keywordId = nextTaskRequest.getKeyword_id();
+ log.info("开始处理任务队列，keywordId: {}", keywordId);
+
executeBatchTask(nextTaskRequest)
.doFinally(signal -> {
- // 完成后，继续处理下一个任务
isProcessing = false;
if (!taskQueue.isEmpty()) {
- processNextTaskInQueue(); // 继续处理队列中的下一个任务
+ processNextTaskInQueue();
}
})
- .subscribe();
+ .subscribe(
+ result -> log.info("任务处理完成，keywordId: {}", keywordId), // 成功日志
+ error -> { // 关键：添加错误处理
+ log.error("任务队列处理异常，keywordId: {}", keywordId, error);
+ }
+ );
+ } else {
+ isProcessing = false; // 无任务时重置状态
}
}
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);
+ List<List<UserDto>> userBatches = splitUsersIntoBatches(searchTaskRequest.getUsers(), maxConcurrentUsers, keywordId,searchTaskRequest.getIs_first());
// 创建批次队列并存入全局映射
@@ -151,32 +161,19 @@
return Mono.just(ResponseResult.success("第一个批次已开始"))
.doOnTerminate(() -> {
executeBatchTask(batchQueue, searchTaskRequest, keywordId)
- .subscribe();
+ .subscribe(
+ result -> log.info("批次任务启动成功，keywordId: {}", keywordId),
+ error -> { // 处理批次执行异常
+ log.error("批次任务执行异常，keywordId: {}", keywordId, error);
+ // 可选：异常时清理资源
+ batchQueues.remove(keywordId);
+ }
+ );
});
}
-/* private Mono<ResponseResult<String>> executeBatchTask(SearchTaskRequest searchTaskRequest) {
- log.info("开始处理任务：{}", searchTaskRequest);
- log.info("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
- 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 LinkedList<>(userBatches); // 用队列存储批次
-
- return Mono.just(ResponseResult.success("第一个批次已开始"))
- .doOnTerminate(() -> {
- // 启动后台任务，继续处理批次
- executeBatchTask(batchQueue, searchTaskRequest, keywordId)
- .subscribe(); // 使用subscribe()启动后台任务
- });
- }*/
-
private Mono<ResponseResult<?>> executeBatchTask(Queue<List<UserDto>> batchQueue, SearchTaskRequest searchTaskRequest, Integer keywordId) {
// 如果队列为空，说明所有批次已经完成
-// if (batchQueue.isEmpty()) {
-// return Mono.just(ResponseResult.success("所有批次已完成"));
-// }
+
if (batchQueue == null || batchQueue.isEmpty()) {
// 清理资源
batchQueues.remove(keywordId);
@@ -201,6 +198,10 @@
return Mono.just(ResponseResult.error("创建批次任务失败"));
}
})
+ .onErrorResume(e -> {
+ log.error("调用第三方接口失败: {}", e.getMessage(), e); // 关键日志
+ return Mono.error(new RuntimeException("调用第三方接口失败: " + e.getMessage()));
+ })
.doFinally(signal -> {
// 任务完成时清理资源
if (batchQueue.isEmpty()) {
@@ -209,26 +210,6 @@
});
}
-// 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)
@@ -239,7 +220,7 @@
return Mono.just(ResponseResult.success("任务已被取消"));
}
// 如果任务状态是"submitted"或"running"，继续轮询
- if (!"completed".equalsIgnoreCase(statusResponse.getStatus()) && !"failed".equalsIgnoreCase(statusResponse.getStatus()) && !"cancelled".equalsIgnoreCase(statusResponse.getStatus()) ) {
+ if (!"completed".equalsIgnoreCase(statusResponse.getStatus()) && !"failed".equalsIgnoreCase(statusResponse.getStatus()) && !"cancelled".equalsIgnoreCase(statusResponse.getStatus()) && !("ERROR".equalsIgnoreCase(statusResponse.getStatus()) && statusResponse.getMessage().contains("Task not found")) ) {
return Mono.delay(Duration.ofSeconds(5)) // 延迟 5 秒后再次查询
.flatMap(aLong -> waitForTaskCompletion(taskId, batchQueue, searchTaskRequest, keywordId)); // 递归调用继续等待
} else {
@@ -272,8 +253,6 @@
});
}
-
-
// 添加一个辅助方法来安全地将字符串转换为double
private double parseUsage(String usageStr) {
try {
@@ -288,93 +267,15 @@
return 0.0;
}
}
- /*@PostMapping("/search")
- @ApiOperation(value = "开始采集")
- public Mono<ResponseResult<?>> createSearchTask(
- @RequestBody SearchTaskRequest searchTaskRequest,
- HttpServletRequest request) throws JsonProcessingException {
- // 首先检查服务器资源
- return getServerResource()
- .flatMap(resourceResponse -> {
- // 将字符串类型的使用率转换为double类型
- double cpuUsage = parseUsage(resourceResponse.getCpu_usage_percent());
- double memoryUsage = parseUsage(resourceResponse.getMemory_usage_percent());
- // 检查CPU和内存使用率
- if (cpuUsage >= 90.0 || memoryUsage >= 90.0) {
- String errorMsg = String.format("服务器资源不足：CPU使用率 %.1f%%，内存使用率 %.1f%%",
- resourceResponse.getCpu_usage_percent(), resourceResponse.getMemory_usage_percent());
- log.warn(errorMsg);
- return Mono.just(ResponseResult.error(503, errorMsg));
- }
- 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);
-
- return Flux.fromIterable(userBatches)
- .flatMap(batch -> {
- SearchTaskRequest batchRequest = new SearchTaskRequest();
- batchRequest.setUsers(batch);
- batchRequest.setQuestions(searchTaskRequest.getQuestions());
- batchRequest.setConfig(searchTaskRequest.getConfig());
- batchRequest.setSave_to_database(searchTaskRequest.getSave_to_database());
- batchRequest.setWebhook_url(searchTaskRequest.getWebhook_url());
- batchRequest.setKeyword_id(keywordId);
-
- return createSingleBatchTask(batchRequest)
- .delaySubscription(Duration.ofSeconds(2)); // 批次之间添加延迟
- }, 1) // 限制并发数为1，确保顺序执行
- .collectList() // 收集所有批次的响应
- .flatMap(responses ->
- saveKeywordTasks(keywordId, responses) // 保存关联关系
- .thenReturn(responses) // 返回原始响应
- )
- .map(responses -> ResponseResult.success(responses)) // 使用ResponseResult包装结果
- .onErrorResume(e -> {
- log.error("创建搜索任务失败: {}", e.getMessage(), e);
- return Mono.just(ResponseResult.error("创建搜索任务失败: " + e.getMessage()));
- });
- })
- .onErrorResume(e -> {
- log.error("检查服务器资源失败: {}", e.getMessage(), e);
- return Mono.just(ResponseResult.error("检查服务器资源失败: " + e.getMessage()));
- });
- }*/
-
-// private Mono<Void> saveKeywordTasks(Integer keywordId, List<SearchTaskResponse> taskResponses) {
-// List<KeywordTask> keywordTasks = taskResponses.stream()
-// .filter(response -> response.getTask_id() != null)
-// .map(response -> {
-// KeywordTask keywordTask = new KeywordTask();
-// keywordTask.setKeyword_id(keywordId);
-// keywordTask.setTask_id(response.getTask_id());
-// keywordTask.setStatus("pending");
-// return keywordTask;
-// })
-// .collect(Collectors.toList());
-//
-// // 将 MyBatis-Plus 的同步方法包装为 Mono<Void>
-// return Mono.fromRunnable(() -> {
-// boolean success = keywordTaskService.saveOrUpdateBatch(keywordTasks);
-// if (!success) {
-//// throw new RuntimeException("保存关键词任务关联失败");
-// // 添加异常处理
-// Mono.error( new RuntimeException("保存关键词任务关联失败"));
-// }
-// })
-// .doFinally(signalType -> log.info("成功保存 {} 个关键词任务关联", keywordTasks.size()))
-// .then();
-// }
-
- private List<List<UserDto>> splitUsersIntoBatches(List<UserDto> users, int batchSize,Integer keywordId) {
+ private List<List<UserDto>> splitUsersIntoBatches(List<UserDto> users, int batchSize,Integer keywordId,Boolean isFirst) {
Keyword keyword = keywordService.getById(keywordId);
- if (null==keyword.getNum()){
- keyword.setNum(0);
+ if (isFirst){
+ keyword.setNum(1);
+ }else {
+ keyword.setNum(keyword.getNum()+1);
}
- keyword.setNum(keyword.getNum()+1);
keywordService.updateById(keyword);
List<List<UserDto>> batches = new ArrayList<>();
@@ -388,7 +289,7 @@
keywordTask.setKeyword_id(keywordId);
keywordTask.setTask_id(null); // 任务ID为空
- keywordTask.setNum(keyword.getNum());// 任务初始状态为 pending
+ keywordTask.setNum(keyword.getNum());
keywordTaskService.save(keywordTask); // 保存 KeywordTask
}
@@ -397,6 +298,11 @@
}
private Mono<SearchTaskResponse> createSingleBatchTask(SearchTaskRequest batchRequest) {
+ // 记录请求第三方的基本信息（便于排查）
+ String thirdPartyUrl = baseUrl + "/api/v1/search";
+ Integer keywordId = batchRequest.getKeyword_id();
+ log.info("开始向第三方提交任务，keywordId: {}, URL: {}, 请求参数: {}",
+ keywordId, thirdPartyUrl, batchRequest.toString()); // 打印请求参数（建议用工具类转JSON）
return webClient.post()
.uri(baseUrl + "/api/v1/search")
.contentType(MediaType.APPLICATION_JSON)
@@ -404,6 +310,16 @@
.retrieve()
.onStatus(HttpStatus::is4xxClientError, response -> response.bodyToMono(String.class)
.flatMap(errorBody -> Mono.error(new RuntimeException(errorBody))))
+ // 处理第三方返回的5xx服务器错误（如第三方服务异常）
+ .onStatus(HttpStatus::is5xxServerError, response ->
+ response.bodyToMono(String.class)
+ .flatMap(errorBody -> {
+ String errorMsg = String.format("第三方接口5xx错误，keywordId: %d, URL: %s, 状态码: %d, 错误详情: %s",
+ keywordId, thirdPartyUrl, response.statusCode().value(), errorBody);
+ log.error(errorMsg);
+ return Mono.error(new RuntimeException(errorMsg));
+ })
+ )
.bodyToMono(new ParameterizedTypeReference<SearchTaskResponse>() {})
.flatMap(taskResponse -> {
if (taskResponse != null && taskResponse.getTask_id() != null) {
@@ -423,6 +339,7 @@
// 获取与关键词相关的任务，task_id 为 null，确保只取一个任务
List<KeywordTask> keywordTasks = keywordTaskService.list(new LambdaQueryWrapper<KeywordTask>()
.eq(KeywordTask::getKeyword_id, keyword.getKeyword_id())
+ .eq(KeywordTask::getNum, keyword.getNum())
.isNull(KeywordTask::getTask_id));
if (keywordTasks.size() > 0) {
KeywordTask keywordTask = keywordTasks.get(0);
@@ -430,24 +347,24 @@
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 的任务
+ //将提问词列表的状态转为pending
+ for (String questionName : batchRequest.getQuestions()) {
+ questionService.update(new LambdaUpdateWrapper<Question>().eq(Question::getKeyword_id, keyword.getKeyword_id()).eq(Question::getQuestion,questionName).set(Question::getStatus, "pending"));
- // 更新任务的 task_id 和状态
-// taskToUpdate.setTask_id(taskResponse.getTask_id());
-// taskToUpdate.setStatus("submitted");
-// keywordTaskService.updateById(taskToUpdate);
+ }
+ //所有关键词都在采集中或者已完成或者错误设置订单进入采集状态
+ 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);
-
- //设置订单进入采集状态
- LambdaUpdateWrapper<Orders> updateOrderWrapper = new LambdaUpdateWrapper<>();
- updateOrderWrapper.eq(Orders::getOrder_id, keyword.getOrder_id()) // 确保字段名正确
- .set(Orders::getStatus, 2); // 直接设置状态值
-
- boolean success = orderService.update(updateOrderWrapper);
- log.info("订单状态更新结果: {}", success ? "成功" : "失败");
-
+ }
+ }
}).subscribeOn(Schedulers.boundedElastic()) // 在弹性线程池执行
.thenReturn(taskResponse);
}
@@ -455,47 +372,6 @@
});
}
- // 移除原来的waitForTaskCompletion方法，不再需要同步等待
-// @ApiOperation(value = "查询任务状态")
-// @GetMapping("/status")
-// public Mono<TaskStatusResponse> getTaskStatus(String taskId) {
-// return webClient.get()
-// .uri(baseUrl + "/api/v1/tasks/" + taskId)
-// .accept(MediaType.APPLICATION_JSON)
-// .retrieve()
-// .onStatus(HttpStatus::isError, response -> response.bodyToMono(TaskStatusResponse.class)
-// .flatMap(errorBody -> Mono.error(new RuntimeException(errorBody.getDetail()))))
-// .bodyToMono(TaskStatusResponse.class)
-// .flatMap(result -> {
-// TaskStatusResponse taskStatusResponse = result;
-// if (taskStatusResponse != null && taskStatusResponse.getStatus() != null) {
-// List<Question> updateQuestions = taskStatusResponse.getQuestions_status().stream()
-// .map(qs -> {
-// Question question = new Question();
-// question.setQuestion_id(qs.getQuestion_id());
-// question.setStatus(qs.getStatus());
-// return question;
-// }).collect(Collectors.toList());
-//
-// // 包装成响应式操作
-// return Mono.fromCallable(() -> {
-// questionService.updateBatchById(updateQuestions);
-// return result;
-// });
-//
-// }
-// return Mono.just(result);
-// })
-// .onErrorResume(e -> {
-// // 创建一个自定义的错误响应对象
-// TaskStatusResponse errorResponse = new TaskStatusResponse();
-// errorResponse.setStatus("ERROR");
-// errorResponse.setMessage(e.getMessage());
-// errorResponse.setDetail(e.getMessage());
-//
-// return Mono.just(errorResponse);
-// });
-// }
@PostMapping("/cancel/{keywordId}")
@ApiOperation(value = "取消任务")
public Mono<ResponseResult<TaskCancelResponse>> cancelTask(@PathVariable Integer keywordId) {
@@ -519,7 +395,7 @@
return Flux.fromIterable(tasksToCancelRemotely)
.flatMap(task -> {
// 创建状态更新和远程取消的组合操作
- Mono<Void> updateStatus = updateTaskStatus(task.getTask_id(), "canceled");
+ Mono<Void> updateStatus = updateTaskStatus(task.getTask_id(), "cancelled");
Mono<ResponseResult<?>> cancelOp = cancelRemoteTask(task.getTask_id())
.onErrorResume(e -> {
log.error("取消任务 {} 失败: {}", task.getTask_id(), e.getMessage());
@@ -563,54 +439,7 @@
.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(() -> {
@@ -624,6 +453,7 @@
//把任务id为空的删除
LambdaUpdateWrapper<KeywordTask> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(KeywordTask::getKeyword_id, keywordId);
updateWrapper.isNull(KeywordTask::getTask_id);
keywordTaskService.remove(updateWrapper);
// 查询该关键词下的所有任务
@@ -633,13 +463,11 @@
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);
-// }
+ keyword.setStatus("completed");
+ keywordService.updateById(keyword);
+
+ //更新提问词状态为取消
+ questionService.update(new LambdaUpdateWrapper<Question>().eq(Question::getKeyword_id, keywordId).isNull(Question::getResponse).set(Question::getStatus, "cancelled"));
// 更新订单状态
String orderId = keyword.getOrder_id();
@@ -651,13 +479,23 @@
// 所有关键词均已完成，则更新订单状态为3
if (!orderKeywords.isEmpty() && orderKeywords.stream().allMatch(k ->
- "completed".equals(k.getStatus()) || "false".equals(k.getStatus()) || "canceled".equals(k.getStatus())
+ "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()) || "cancelled".equals(k.getStatus())
+ )) {
+ Orders orders = orderService.getById(orderId);
+ if (orders != null) {
+ orders.setStatus(1);
+ orderService.updateById(orders);
+ log.info("订单 {} 所有关键词已完成或者取消，更新状态为1", orderId);
}
}
}
@@ -683,9 +521,7 @@
return removedTasks;
}
-
- // 发送远程取消请求
-// 发送远程取消请求（使用Java 8兼容的Map创建方式）
+// 发送远程取消请求
private Mono<ResponseResult<?>> cancelRemoteTask(String taskId) {
// 使用Collections.singletonMap或手动创建Map
Map<String, Object> requestBody = new HashMap<>();
@@ -746,78 +582,14 @@
});
}
-// private Mono<Void> updateQuestionAndReference(TaskResultResponse result) {
-// return Mono.fromRunnable(() -> {
-// // 1. 更新关键词状态
-// LambdaUpdateWrapper<Keyword> keywordUpdate = new LambdaUpdateWrapper<>();
-// keywordUpdate.eq(Keyword::getTask_id, result.getTask_id())
-// .set(Keyword::getStatus, "completed");
-// keywordService.update(keywordUpdate);
-//
-// // 查询关键词ID
-// LambdaQueryWrapper<Keyword> keywordQuery = new LambdaQueryWrapper<>();
-// keywordQuery.eq(Keyword::getTask_id, result.getTask_id());
-// Keyword keyword = keywordService.getOne(keywordQuery);
-//
-// if (keyword == null) {
-// System.out.println("未找到关联的关键词，task_id: " + result.getTask_id());
-// return;
-// }
-//
-// // 2. 处理每个用户的问题结果
-// for (UserResult userResult : result.getResults()) {
-// for (QuestionResult questionResult : userResult.getQuestions_results()) {
-// // 2.1 查询问题ID
-// LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();
-// queryWrapper.eq(Question::getQuestion, questionResult.getQuestion())
-// .eq(Question::getKeyword_id, keyword.getKeyword_id());
-// Question question = questionService.getOne(queryWrapper);
-//
-// if (question != null) {
-// // 更新问题状态
-// LambdaUpdateWrapper<Question> updateWrapper = new LambdaUpdateWrapper<>();
-// updateWrapper.eq(Question::getQuestion_id, question.getQuestion_id())
-// .set(Question::getStatus, questionResult.getStatus())
-// .set(Question::getResponse, questionResult.getResponse())
-// .set(Question::getExtracted_count, questionResult.getExtracted_count())
-// .set(Question::getError, questionResult.getError())
-// .set(Question::getTimestamp, LocalDateTime.parse(
-// questionResult.getTimestamp(),
-// DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
-// ));
-// questionService.update(updateWrapper);
-//
-// // 2.2 保存引用数据
-// List<Reference> references = questionResult.getReferences().stream()
-// .map(ref -> {
-// Reference reference = new Reference();
-// reference.setQuestion_id(question.getQuestion_id());
-// reference.setTitle(ref.getTitle());
-// reference.setUrl(ref.getUrl());
-// reference.setDomain(ref.getDomain());
-// reference.setCreate_time(LocalDateTime.now());
-// return reference;
-// })
-// .collect(Collectors.toList());
-//
-// if (!references.isEmpty()) {
-// referenceService.saveBatch(references);
-// }
-// } else {
-// System.out.println("未找到匹配的问题，question " + question.getQuestion());
-//
-// }
-// }
-// }
-// });
-// }
/**
* 获取或创建平台（确保同一domain只创建一次）
* @param domain 平台域名
* @return 已存在或新创建的Platform
*/
- private Platform getOrCreatePlatform(String domain) {
+ private Platform getOrCreatePlatform(String domain,String platformName) {
// 1. 先尝试查询已存在的平台
+
Platform platform = platformService.getPlatformByDomain(domain);
if (platform != null) {
return platform;
@@ -837,7 +609,12 @@
// 2.2 构建新平台对象
Platform newPlatform = new Platform();
newPlatform.setDomain(domain);
- newPlatform.setPlatform_name(domain); // 平台名称默认使用域名，可根据实际需求调整
+ if (platformName != null) {
+ newPlatform.setPlatform_name(platformName);
+ }else {
+ newPlatform.setPlatform_name(domain);
+ }
+ // 平台名称默认使用域名，可根据实际需求调整
newPlatform.setType_id(defaultType.getType_id());
newPlatform.setCreate_time(LocalDateTime.now()); // 补充创建时间
@@ -855,6 +632,7 @@
throw new RuntimeException("创建平台失败", e);
}
}
+ //更新提问词和引用数据
private Mono<Void> updateQuestionAndReference(TaskResultResponse result) {
return Mono.fromRunnable(() -> {
try {
@@ -873,43 +651,20 @@
System.out.println("未找到关联的关键词，task_id: " + result.getTask_id());
//报错
throw new Exception("未找到关联的关键词，task_id: " + result.getTask_id());
-// return;
+
}
LambdaQueryWrapper<KeywordTask> keywordTaskWrapper2 = new LambdaQueryWrapper<>();
keywordTaskWrapper2.eq(KeywordTask::getKeyword_id, keyword.getKeyword_id());
List<KeywordTask> keywordTasks = keywordTaskService.list(keywordTaskWrapper2);
- //如果全部为completed 关键词也为completed ，如果关联关系没有任务id，或者状态为running ，关键词为submitted，
- if (keywordTasks.stream().allMatch(task -> "completed".equals(task.getStatus()) || "false".equals(task.getStatus()) || "canceled".equals(task.getStatus())) ) {
+ //如果全部为completed 或者错误、取消、任务不存在 关键词也为completed ，如果关联关系没有任务id，或者状态为running ，关键词为submitted，
+ if (keywordTasks.stream().allMatch(task -> "completed".equals(task.getStatus()) || "false".equals(task.getStatus()) || "cancelled".equals(task.getStatus()) ||"canceled".equals(task.getStatus()) || "nonentity".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() + "]未关联订单，跳过订单状态更新");
@@ -925,9 +680,21 @@
System.out.println("订单[" + orderId + "]下无关键词，跳过状态更新");
return;
}
+ boolean allValid2 = orderKeywords.stream()
+ .allMatch(k -> "completed".equals(k.getStatus()) || "false".equals(k.getStatus()) || "cancelled".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()) || "canceled".equals(k.getStatus()));
+ .allMatch(k -> "completed".equals(k.getStatus()) || "false".equals(k.getStatus()));
// 4. 若所有关键词状态均有效，更新订单状态为3
if (allValid) {
@@ -940,6 +707,7 @@
System.out.println("未找到订单[" + orderId + "]，无法更新状态");
}
}
+
Orders orders = orderService.getById(keyword.getOrder_id());
@@ -956,76 +724,87 @@
List<Question> questionsToUpdate = new ArrayList<>();
List<Reference> allReferences = new ArrayList<>();
List<Reference> resultList = new ArrayList<>();
+
// 遍历结果
for (UserResult userResult : result.getResults()) {
+ //更新账号状态
+ 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);
+ //更新所有提问词的状态
+ questionService.update(new LambdaUpdateWrapper<Question>().eq(Question::getKeyword_id, keyword.getKeyword_id())
+ .set(Question::getStatus, "failed")
+ .set(Question::getError, "账户登录失败"));
+
+ }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);
+ }
+ }
for (QuestionResult questionResult : userResult.getQuestions_results()) {
try {
Question question = questionMap.get(questionResult.getQuestion());
if (question != null) {
+
+
+ //保存问题结果
+ QuestionResultList questionResultList = new QuestionResultList();
+ questionResultList.setKeyword_id(keyword.getKeyword_id());
+ questionResultList.setQuestion(questionResult.getQuestion());
+ questionResultList.setResponse(questionResult.getResponse());
+ questionResultList.setStatus(questionResult.getStatus());
+ questionResultList.setExtracted_count(questionResult.getExtracted_count());
+ questionResultList.setKeyword_task_id(result.getTask_id());
+ questionResultList.setError(questionResult.getError());
+ questionResultList.setNum(keyword.getNum());
+ if (questionResult.getTimestamp() != null) {
+ DateTimeFormatter formatter = DateTimeFormatter
+ .ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS");
+ questionResultList.setTimestamp(
+ LocalDateTime.parse(questionResult.getTimestamp(), formatter));
+ }
+ // 保存问题结果列表（新增保存逻辑）
+ questionResultService.save(questionResultList);
+ // 查询当前轮次下该提问词的所有结果
+ List<QuestionResultList> allResults = questionResultService.list(
+ new LambdaQueryWrapper<QuestionResultList>()
+ .eq(QuestionResultList::getKeyword_id, keyword.getKeyword_id())
+ .eq(QuestionResultList::getQuestion, question.getQuestion())
+ .eq(QuestionResultList::getNum, keyword.getNum())
+ );
+
+ // 判断最终状态
+ String finalStatus = determineFinalStatus(allResults);
+ if ("success".equals(finalStatus)){
+ question.setStatus("success");
+ question.setError("");
+ }else if ("no_results".equals(finalStatus)){
+ question.setStatus("success");
+ question.setError("采集结果无引用数据");
+ }else if ("busyness".equals(finalStatus)){
+ question.setStatus("failed");
+ question.setError("DeepSeek繁忙，请稍后尝试");
+ }
+
// 更新问题对象
- question.setStatus(questionResult.getStatus());
question.setResponse(questionResult.getResponse());
question.setExtracted_count(questionResult.getExtracted_count());
- question.setError(questionResult.getError());
+// question.setError(questionResult.getError());
question.setKeyword_id(keyword.getKeyword_id());
- // 解析时间戳
if (questionResult.getTimestamp() != null) {
DateTimeFormatter formatter = DateTimeFormatter
.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS");
question.setTimestamp(
LocalDateTime.parse(questionResult.getTimestamp(), formatter));
}
- //更新
-// questionService.updateById(question);
questionsToUpdate.add(question);
-
- /* List<Reference> references =
- Optional.ofNullable(questionResult.getReferences())
- .orElse(Collections.emptyList())
- .stream()
- .map(ref -> {
- 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());
- //域名和平台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());
- 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());
- }
- }
- return reference;
- })
- .collect(Collectors.toList());*/
// 初始化引用列表（避免null）
List<Reference> references = new ArrayList<>();
List<TaskResultResponse.Reference> originalReferences = questionResult.getReferences();
@@ -1034,7 +813,7 @@
}
// 遍历原始引用列表，转换为Reference对象
- for (TaskResultResponse.Reference ref : originalReferences) { // 注意：需将“原引用类型”替换为实际类型（如QuestionResult中的引用类型）
+ for (TaskResultResponse.Reference ref : originalReferences) {
Reference reference = new Reference();
// 设置基本字段
reference.setQuestion_id(question.getQuestion_id());
@@ -1044,40 +823,12 @@
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());
- }
+ if (null!=ref.getPublish_time()) {
+ reference.setCreate_time(ref.getPublish_time().atStartOfDay());
}
-*/
+
// 关键：使用优化后的方法获取平台，避免重复创建
- Platform platform = getOrCreatePlatform(ref.getDomain());
+ Platform platform = getOrCreatePlatform(ref.getDomain(),ref.getPlatform_name());
reference.setPlatform_id(platform.getPlatform_id());
reference.setType_id(platform.getType_id()); // 直接从平台获取类型ID，更可靠
// 添加到结果列表
@@ -1140,21 +891,7 @@
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);
- }
- }
}
@@ -1165,28 +902,55 @@
System.out.println("成功批量更新 " + questionsToUpdate.size() + " 个问题");
}
- // 5. 批量插入引用，使用流式分批处理
-// if (!allReferences.isEmpty()) {
-// int batchSize = 1000;
-// IntStream.iterate(0, i -> i + batchSize)
-// .limit((allReferences.size() + batchSize - 1) / batchSize)
-// .forEach(i -> {
-// List<Reference> batch = allReferences.subList(
-// i, Math.min(i + batchSize, allReferences.size()));
-// referenceService.saveBatch(batch);
-// });
-// System.out.println("成功批量插入 " + allReferences.size() + " 条引用数据");
-// }
-
-
} catch (Exception e) {
log.error("更新问题和引用数据失败: " ,e.getMessage(), e);
-// System.out.println("更新问题和引用数据失败: " + e.getMessage());
throw new RuntimeException("更新问题和引用数据失败", e);
}
});
}
+ // 根据所有批次的结果判断最终状态
+ private String determineFinalStatus(List<QuestionResultList> results) {
+ if (results.isEmpty()) {
+ return "no_results"; // 无结果
+ }
+ // 统计关键指标
+ int totalCount = results.size();
+ int emptyResponseCount = 0;
+ int systemBusyCount = 0;
+
+ for (QuestionResultList result : results) {
+ // 判断回答是否为空
+ if (result.getExtracted_count() == 0 ) {
+ emptyResponseCount++;
+ }
+
+ // 判断是否为系统繁忙
+ if ("success".equals(result.getStatus()) && (result.getResponse().isEmpty()|| result.getResponse().contains("WebDriver连接中断") || result.getResponse().contains("响应超时"))) {
+ systemBusyCount++;
+ }
+
+ }
+
+ // 全返回系统繁忙
+ if (systemBusyCount == totalCount) {
+ return "busyness";
+ }
+ // 全返回信息为空
+ if (emptyResponseCount == totalCount) {
+ return "no_results";
+ }
+
+
+ // 系统繁忙比例超过阈值（可配置，这里设为70%）
+// double busyRate = (double) systemBusyCount / totalCount;
+// if (busyRate >= 0.7) {
+// return "系统繁忙，请稍后尝试";
+// }
+
+ // 其他情况返回成功
+ return "success";
+ }
@GetMapping("/tasks/all")
@ApiOperation(value = "获取所有任务列表")
public Mono<TaskListResponse> getAllTasks() {
@@ -1200,8 +964,6 @@
TaskListResponse response = new TaskListResponse();
response.setDetail("获取任务列表失败: " + e.getMessage());
return Mono.just(response);
-
- // return Mono.just(ResponseResult.error("获取任务列表失败: " + e.getMessage()));
});
}
@@ -1229,9 +991,7 @@
.onErrorResume(e -> Mono.just(
new ServerResourceResponse( e.getMessage())));
}
- /**
- * 传入orderid查所有关键词id以及关键词下面的所有任务id，轮询所有任务状态，如果状态为completed，则循环调用获取结果接口，处理结果
- */
+
}
--
Gitblit v1.7.1