From ff1fec7eae681e89e607fd441d2597ab67b5ed2a Mon Sep 17 00:00:00 2001 From: guyue <1721849008@qq.com> Date: 星期二, 12 八月 2025 19:04:34 +0800 Subject: [PATCH] 修改查看时间和删除关键词 --- src/main/java/com/linghu/controller/CollectController.java | 611 ++----------------------------------------------------- 1 files changed, 25 insertions(+), 586 deletions(-) diff --git a/src/main/java/com/linghu/controller/CollectController.java b/src/main/java/com/linghu/controller/CollectController.java index 09acdce..5ccdb76 100644 --- a/src/main/java/com/linghu/controller/CollectController.java +++ b/src/main/java/com/linghu/controller/CollectController.java @@ -1,52 +1,23 @@ package com.linghu.controller; -import java.time.Duration; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.stream.Collectors; -import javax.annotation.Resource; + import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.linghu.mapper.PlatformMapper; -import com.linghu.mapper.TypeMapper; import com.linghu.model.dto.*; -import com.linghu.model.entity.*; + import com.linghu.service.*; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.*; -import org.springframework.web.client.RestTemplate; -import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.linghu.model.common.ResponseResult; -import com.linghu.utils.JwtUtils; - -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 reactor.core.publisher.SignalType; - import org.springframework.web.bind.annotation.* ; -import org.springframework.http.HttpStatus; -import com.linghu.model.dto.TaskResultResponse.QuestionResult; -import com.linghu.model.dto.TaskResultResponse.UserResult; -import reactor.core.scheduler.Schedulers; -import java.util.stream.Collectors; -import java.util.stream.IntStream; + @RestController @RequestMapping("/collect") @@ -54,592 +25,60 @@ @Slf4j public class CollectController { - @Autowired - private ReferenceService referenceService; - - @Value("${linghu.url}") - private String baseUrl; @Autowired - private WebClient webClient; - - @Autowired - private JwtUtils jwtUtils; - @Autowired - private KeywordService keywordService; - @Autowired - private QuestionService questionService; - @Autowired - private KeywordTaskService keywordTaskService; - @Autowired - private PlatformService platformService; - @Autowired - private TypeService typeService; + private CollectionService collectionService; - /* @PostMapping("/search") + + @PostMapping("/search") @ApiOperation(value = "开始采集") - public Mono<SearchTaskResponse> createSearchTask( - @RequestBody SearchTaskRequest searchTaskRequest, + public Mono<ResponseResult<?>> createSearchTask( + @Valid @RequestBody SearchTaskRequest searchTaskRequest, HttpServletRequest request) throws JsonProcessingException { - - return webClient.post() - .uri(baseUrl + "/api/v1/search") - .contentType(MediaType.APPLICATION_JSON) - .bodyValue(searchTaskRequest) - .retrieve() - .onStatus(HttpStatus::is4xxClientError, response -> response.bodyToMono(String.class) - .flatMap(errorBody -> Mono.error(new RuntimeException(errorBody)))) - .bodyToMono(new ParameterizedTypeReference<SearchTaskResponse>() { - }) - .flatMap(responseResult -> { - // 提取任务ID - SearchTaskResponse taskResponse = responseResult; - if (taskResponse != null && taskResponse.getTask_id() != null) { - // 保存任务ID到关键词 - LambdaUpdateWrapper<Keyword> updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(Keyword::getKeyword_id, searchTaskRequest.getKeyword_id()); - updateWrapper.set(Keyword::getStatus,"Submitted"); - updateWrapper.set(Keyword::getTask_id, taskResponse.getTask_id()); - keywordService.update(updateWrapper); - - // 可选:更新响应中的其他信息 - - } - return Mono.just(taskResponse); - }) - .onErrorResume(e -> { - // return Mono.just(ResponseResult.error("调用失败: " + e.getMessage())); - SearchTaskResponse task = new SearchTaskResponse(); - task.setMessage("调用失败: " + e.getMessage()); - return Mono.just(task); - }); - }*/ - -// public SearchTaskController(WebClient.Builder webClientBuilder, KeywordService keywordService) { -// this.webClient = webClientBuilder.build(); -// this.keywordService = keywordService; -// } - - /* @PostMapping("/search") - @ApiOperation(value = "开始采集") - public Mono<SearchTaskResponse> createSearchTask( - @RequestBody SearchTaskRequest searchTaskRequest, - HttpServletRequest request) throws JsonProcessingException { - - int maxConcurrentUsers = searchTaskRequest.getConfig() != null ? - searchTaskRequest.getConfig().getMax_concurrent_users() : 3; - List<List<UserDto>> userBatches = splitUsersIntoBatches(searchTaskRequest.getUsers(), maxConcurrentUsers); - - return processBatchesSequentially(userBatches, searchTaskRequest) - .onErrorResume(e -> { - SearchTaskResponse task = new SearchTaskResponse(); - task.setMessage("调用失败: " + e.getMessage()); - return Mono.just(task); - }); + // 首先检查服务器资源 + return collectionService.getResponseResultMono(searchTaskRequest); } - private List<List<UserDto>> splitUsersIntoBatches(List<UserDto> users, int batchSize) { - 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()))); - } - return batches; - } - - private Mono<SearchTaskResponse> processBatchesSequentially(List<List<UserDto>> userBatches, SearchTaskRequest originalRequest) { - Mono<SearchTaskResponse> resultMono = Mono.empty(); - for (List<UserDto> batch : userBatches) { - SearchTaskRequest batchRequest = new SearchTaskRequest(); - batchRequest.setUsers(batch); - batchRequest.setQuestions(originalRequest.getQuestions()); - batchRequest.setConfig(originalRequest.getConfig()); - batchRequest.setSave_to_database(originalRequest.getSave_to_database()); - batchRequest.setWebhook_url(originalRequest.getWebhook_url()); - batchRequest.setKeyword_id(originalRequest.getKeyword_id()); - - resultMono = resultMono.then(createSingleBatchTask(batchRequest)); - } - return resultMono; - } - - private Mono<SearchTaskResponse> createSingleBatchTask(SearchTaskRequest batchRequest) { - return webClient.post() - .uri(baseUrl + "/api/v1/search") - .contentType(MediaType.APPLICATION_JSON) - .bodyValue(batchRequest) - .retrieve() - .onStatus(HttpStatus::is4xxClientError, response -> response.bodyToMono(String.class) - .flatMap(errorBody -> Mono.error(new RuntimeException(errorBody)))) - .bodyToMono(new ParameterizedTypeReference<SearchTaskResponse>() { - }) - .flatMap(responseResult -> { - SearchTaskResponse taskResponse = responseResult; - if (taskResponse != null && taskResponse.getTask_id() != null) { - LambdaUpdateWrapper<Keyword> updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(Keyword::getKeyword_id, batchRequest.getKeyword_id()); - updateWrapper.set(Keyword::getStatus, "Submitted"); - updateWrapper.set(Keyword::getTask_id, taskResponse.getTask_id()); - keywordService.update(updateWrapper); - } - return waitForTaskCompletion(taskResponse.getTask_id()) - .then(Mono.just(taskResponse)); - }); - } - - private Mono<Void> waitForTaskCompletion(String taskId) { - return Flux.interval(Duration.ofSeconds(5)) // 每5秒执行一次 - .flatMap(tick -> webClient.get() - .uri(baseUrl + "/api/v1/tasks/" + taskId) - .retrieve() - .bodyToMono(TaskStatusResponse.class) - ) - .filter(response -> "completed".equals(response.getStatus())) - .next() // 找到第一个完成的响应后结束流 - .then(); // 转换为Mono<Void> - }*/ - @PostMapping("/search") - @ApiOperation(value = "开始采集") - public Mono<List<SearchTaskResponse>> createSearchTask( - @RequestBody SearchTaskRequest searchTaskRequest, - HttpServletRequest request) throws JsonProcessingException { - - int maxConcurrentUsers = searchTaskRequest.getConfig() != null ? - searchTaskRequest.getConfig().getMax_concurrent_users() : 3; - List<List<UserDto>> userBatches = splitUsersIntoBatches(searchTaskRequest.getUsers(), maxConcurrentUsers); - - // 获取 keywordId - Integer keywordId = searchTaskRequest.getKeyword_id(); - - 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) // 返回原始响应 - ); - } - - 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()); - return keywordTask; - }) - .collect(Collectors.toList()); - - // 将 MyBatis-Plus 的同步方法包装为 Mono<Void> - return Mono.fromRunnable(() -> { - boolean success = keywordTaskService.saveOrUpdateBatch(keywordTasks); - if (!success) { - throw new RuntimeException("保存关键词任务关联失败"); - } - }) - .doFinally(signalType -> log.info("成功保存 {} 个关键词任务关联", keywordTasks.size())) - .then(); - } - - private List<List<UserDto>> splitUsersIntoBatches(List<UserDto> users, int batchSize) { - 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()))); - } - return batches; - } - - private Mono<SearchTaskResponse> createSingleBatchTask(SearchTaskRequest batchRequest) { - return webClient.post() - .uri(baseUrl + "/api/v1/search") - .contentType(MediaType.APPLICATION_JSON) - .bodyValue(batchRequest) - .retrieve() - .onStatus(HttpStatus::is4xxClientError, response -> response.bodyToMono(String.class) - .flatMap(errorBody -> Mono.error(new RuntimeException(errorBody)))) - .bodyToMono(new ParameterizedTypeReference<SearchTaskResponse>() {}) - .flatMap(taskResponse -> { - if (taskResponse != null && taskResponse.getTask_id() != null) { - // 使用 Reactor 的方式更新数据库 - return Mono.fromRunnable(() -> { - LambdaUpdateWrapper<Keyword> updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(Keyword::getKeyword_id, batchRequest.getKeyword_id()); - updateWrapper.set(Keyword::getStatus, "Submitted"); - updateWrapper.set(Keyword::getTask_id, taskResponse.getTask_id()); - keywordService.update(updateWrapper); - }).subscribeOn(Schedulers.boundedElastic()) // 在弹性线程池执行 - .thenReturn(taskResponse); - } - return Mono.just(taskResponse); - }); - } - - // 移除原来的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); - }); + public Mono<TaskStatusResponse> getTaskStatus(@RequestParam(value = "taskId" )String taskId) { + return collectionService.getError(taskId); } - @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) - .map(data -> ResponseResult.success(data)) - .onErrorResume(e -> { - if (e.getMessage().contains("任务不存在")) { - return Mono.just(ResponseResult.error(404, "任务不存在")); - } else if (e.getMessage().contains("无法取消")) { - return Mono.just(ResponseResult.error(400, "任务已完成,无法取消")); - } - return Mono.just(ResponseResult.error(500, "取消任务失败: " + e.getMessage())); - }); + public Mono<ResponseResult<TaskCancelResponse>> cancelTask(@PathVariable Integer keywordId) { + return collectionService.getResponseResult(keywordId); } @ApiOperation(value = "获取任务结果") @GetMapping("/tasks/{taskId}") public Mono<TaskResultResponse> getTaskResult(@PathVariable String taskId) { - return webClient.get() - .uri(baseUrl + "/api/v1/tasks/" + taskId + "/result") - .accept(MediaType.APPLICATION_JSON) - .retrieve() - .onStatus(HttpStatus::is4xxClientError, response -> { - if (response.statusCode() == HttpStatus.NOT_FOUND) { - return response.bodyToMono(String.class) - .flatMap(errorBody -> Mono.error(new RuntimeException("任务不存在"))); - } else if (response.statusCode() == HttpStatus.BAD_REQUEST) { - return response.bodyToMono(String.class) - .flatMap(errorBody -> Mono.error(new RuntimeException("任务未完成,无法获取结果"))); - } - return response.createException().flatMap(Mono::error); - }) - .bodyToMono(TaskResultResponse.class) - .flatMap(responseResult -> { - TaskResultResponse result = responseResult; - if (result != null && result.getResults() != null) { - return updateQuestionAndReference(result) - .thenReturn(responseResult); - } - return Mono.just(responseResult); - }) - .onErrorResume(e -> { - System.out.println("获取任务结果失败"); - TaskResultResponse result = new TaskResultResponse(); - result.setDetail("获取任务结果失败: " + e.getMessage()); - return Mono.just(result); - }); - } - -// 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()); -// -// } -// } -// } -// }); -// } - - private Mono<Void> updateQuestionAndReference(TaskResultResponse result) { - return Mono.fromRunnable(() -> { - try { - // 1. 更新关键词状态 - LambdaUpdateWrapper<Keyword> keywordUpdate = new LambdaUpdateWrapper<>(); - keywordUpdate.eq(Keyword::getTask_id, result.getTask_id()) - .set(Keyword::getStatus, "completed"); - keywordService.update(keywordUpdate); - - // 查询关键词ID - - LambdaQueryWrapper<KeywordTask> keywordTaskWrapper = new LambdaQueryWrapper<>(); - keywordTaskWrapper.eq(KeywordTask::getTask_id, result.getTask_id()); - KeywordTask keywordTask = keywordTaskService.getOne(keywordTaskWrapper); - -// LambdaQueryWrapper<Keyword> keywordQuery = new LambdaQueryWrapper<>(); -// keywordQuery.eq(Keyword::getTask_id, keywordTask.getTask_id()); - Keyword keyword = keywordService.getById(keywordTask.getKeyword_id()); - - if (keyword == null) { - System.out.println("未找到关联的关键词,task_id: " + result.getTask_id()); - //报错 - throw new Exception("未找到关联的关键词,task_id: " + result.getTask_id()); -// return; - } - - // 2. 批量查询所有问题 - LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Question::getKeyword_id, keyword.getKeyword_id()); - List<Question> questions = questionService.list(queryWrapper); - - // 构建问题映射表,用于快速查找 - Map<String, Question> questionMap = questions.stream() - .collect(Collectors.toMap(Question::getQuestion, q -> q)); - - // 3. 收集所有需要更新的问题和引用 - List<Question> questionsToUpdate = new ArrayList<>(); - List<Reference> allReferences = new ArrayList<>(); - - // 遍历结果 - for (UserResult userResult : result.getResults()) { - for (QuestionResult questionResult : userResult.getQuestions_results()) { - try { - Question question = questionMap.get(questionResult.getQuestion()); - if (question != null) { - // 更新问题对象 - question.setStatus(questionResult.getStatus()); - question.setResponse(questionResult.getResponse()); - question.setExtracted_count(questionResult.getExtracted_count()); - 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); - - //如果查询结果不为空查询num - Integer maxNumByKeywordId = referenceService.getMaxNumByKeywordId(keyword.getKeyword_id()); - if (maxNumByKeywordId != null){ - maxNumByKeywordId++; - }else { - maxNumByKeywordId = 1; - } - - - // 收集引用数据,处理空集合情况 - Integer finalMaxNumByKeywordId = maxNumByKeywordId; - 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(finalMaxNumByKeywordId); - //域名和平台id映射 - reference.setCreate_time(LocalDateTime.now()); - Platform platform = platformService.getPlatformByDomain(reference.getDomain()); -// if (platform == null) { -// throw new RuntimeException("未找到对应的平台: " + reference.getDomain()); -// } - if (platform != null){ - reference.setPlatform_id(platform.getPlatform_id()); - Type type = typeService.getById(platform.getType_id()); -// if (type == null) { -// throw new RuntimeException("未找到对应的类型: " + reference.getDomain()); -// } - if (type != null){ - reference.setType_id(type.getType_id()); - } - } - - - // 根据 domain 查询类型 - - - return reference; - }) - .collect(Collectors.toList()); - - // 添加到总引用列表 - if (!references.isEmpty()) { - allReferences.addAll(references); - } - } - } catch (Exception e) { - log.error(e.getMessage(), e); - System.out.println("处理问题结果失败: " + e.getMessage()); - } - } - } - - // 4. 批量更新问题 - System.out.println(questionsToUpdate); - if (!questionsToUpdate.isEmpty()) { - questionService.updateBatchById(questionsToUpdate); - System.out.println("成功批量更新 " + questionsToUpdate.size() + " 个问题"); - } - referenceService.saveBatch(allReferences); - // 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); - } - }); + return collectionService.getTaskResultResponseMono(taskId); } @GetMapping("/tasks/all") @ApiOperation(value = "获取所有任务列表") public Mono<TaskListResponse> getAllTasks() { - return webClient.get() - .uri(baseUrl + "/api/v1/tasks") - .accept(MediaType.APPLICATION_JSON) - .retrieve() - .bodyToMono(new ParameterizedTypeReference<TaskListResponse>() { - }) - .onErrorResume(e -> { - TaskListResponse response = new TaskListResponse(); - response.setDetail("获取任务列表失败: " + e.getMessage()); - return Mono.just(response); - - // return Mono.just(ResponseResult.error("获取任务列表失败: " + e.getMessage())); - }); + return collectionService.getTaskListResponseMono(); } @GetMapping("/health") + @ApiOperation("健康检查") public Mono<HealthResponse> checkThirdPartyHealth() { - return webClient.get() - .uri(baseUrl + "/health") // 假设第三方健康检查接口路径为/health - .retrieve() - .bodyToMono(HealthResponse.class) - .onErrorResume(e -> Mono.just( - new HealthResponse("unhealthy", null, "", e.getMessage()))); + return collectionService.getHealthResponseMono(); } /** * 查询服务器资源 */ @GetMapping("/server/resource") + @ApiOperation(value = "查询服务器资源") public Mono<ServerResourceResponse> getServerResource() { - return webClient.get() - .uri(baseUrl + "/api/v1/system/resources") - .retrieve() - .bodyToMono(ServerResourceResponse.class) - .onErrorResume(e -> Mono.just( - new ServerResourceResponse( e.getMessage()))); + return collectionService.getServerResourceResponseMono(); } + + + } -- Gitblit v1.7.1