Merge remote-tracking branch 'origin/master'

guyue

2 天以前 b7ff8446a58d59e7df8a588104c231c7af7d8573

 src/main/java/com/linghu/controller/CollectController.java

@@ -6,26 +6,18 @@
import java.util.*;
import java.util.stream.Collectors;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

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;
@@ -37,7 +29,6 @@
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;
@@ -76,6 +67,10 @@
    private PlatformService platformService;
    @Autowired
    private TypeService typeService;
    @Autowired
    private UserService userService;
    @Autowired
    private OrderService orderService;


 /*   @PostMapping("/search")
@@ -199,39 +194,73 @@
                .next() // 找到第一个完成的响应后结束流
                .then(); // 转换为Mono<Void>
    }*/
   // 添加一个辅助方法来安全地将字符串转换为double
   private double parseUsage(String usageStr) {
       try {
           if (usageStr != null) {
               // 移除可能存在的百分号
               usageStr = usageStr.replace("%", "").trim();
               return Double.parseDouble(usageStr);
           }
           return 0.0;
       } catch (NumberFormatException e) {
           log.error("解析资源使用率失败: {}", e.getMessage());
           return 0.0;
       }
   }
   @PostMapping("/search")
   @ApiOperation(value = "开始采集")
   public Mono<List<SearchTaskResponse>> createSearchTask(
   public Mono<ResponseResult<?>> createSearchTask(
           @RequestBody SearchTaskRequest searchTaskRequest,
           HttpServletRequest request) throws JsonProcessingException {

       int maxConcurrentUsers = searchTaskRequest.getConfig() != null ?
               searchTaskRequest.getConfig().getMax_concurrent_users() : 3;
       // 首先检查服务器资源
       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();

       // 获取 keywordId
       Integer keywordId = searchTaskRequest.getKeyword_id();
       //分割
       List<List<UserDto>> userBatches = splitUsersIntoBatches(searchTaskRequest.getUsers(), maxConcurrentUsers,keywordId);
                   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 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) // 返回原始响应
               );
                               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) {
@@ -250,7 +279,9 @@
        return Mono.fromRunnable(() -> {
                    boolean success = keywordTaskService.saveOrUpdateBatch(keywordTasks);
                    if (!success) {
                        throw new RuntimeException("保存关键词任务关联失败");
//                        throw new RuntimeException("保存关键词任务关联失败");
                        // 添加异常处理
                        Mono.error( new RuntimeException("保存关键词任务关联失败"));
                    }
                })
                .doFinally(signalType -> log.info("成功保存 {} 个关键词任务关联", keywordTasks.size()))
@@ -259,12 +290,12 @@

    private List<List<UserDto>> splitUsersIntoBatches(List<UserDto> users, int batchSize,Integer keywordId) {

        Keyword keyword = keywordService.getById(keywordId);
  /*      Keyword keyword = keywordService.getById(keywordId);
        if (null==keyword.getNum()){
            keyword.setNum(0);
        }
        keyword.setNum(keyword.getNum()+1);
        keywordService.updateById(keyword);
        keywordService.updateById(keyword);*/

        List<List<UserDto>> batches = new ArrayList<>();
        for (int i = 0; i < users.size(); i += batchSize) {
@@ -292,6 +323,21 @@
                                    updateWrapper.set(Keyword::getStatus, "submitted");
                                    updateWrapper.set(Keyword::getTask_id, taskResponse.getTask_id());
                                    keywordService.update(updateWrapper);
                                    //设置轮数
                                    Keyword keyword = keywordService.getById(batchRequest.getKeyword_id());
                                    if (null==keyword.getNum()){
                                        keyword.setNum(0);
                                    }
                                    keyword.setNum(keyword.getNum()+1);
                                    keywordService.updateById(keyword);
                                    //设置订单进入采集状态
                                    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);
                    }
@@ -352,14 +398,39 @@
                .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();

                    // 更新关键词任务状态
                    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();

                    // 并行执行两个更新操作，并在完成后返回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, "任务不存在"));
                        return Mono.just(ResponseResult.error(200, e.getMessage()));
                    } else if (e.getMessage().contains("无法取消")) {
                        return Mono.just(ResponseResult.error(200, "任务已完成，无法取消"));
                        return Mono.just(ResponseResult.error(200, e.getMessage()));
                    }
                    return Mono.just(ResponseResult.error(500, "取消任务失败: " + e.getMessage()));
                    return Mono.just(ResponseResult.error(500,  e.getMessage()));
                });
    }

@@ -391,7 +462,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);
                });
@@ -466,6 +540,8 @@
    private Mono<Void> updateQuestionAndReference(TaskResultResponse result) {
        return Mono.fromRunnable(() -> {
            try {
                //查看每个账号信息的status是否正常

                // 1. 根据KeywordTask更新关键词状态
                // 查询关键词ID
                LambdaQueryWrapper<KeywordTask> keywordTaskWrapper = new LambdaQueryWrapper<>();
@@ -480,8 +556,60 @@
                    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);
                    String orderId = keyword.getOrder_id();
                    if (orderId == null || orderId.isEmpty()) {
                        System.out.println("关键词[" + keyword.getKeyword_id() + "]未关联订单，跳过订单状态更新");
                        return;
                    }

                    // 2. 查询该订单下的所有关键词
                    LambdaQueryWrapper<Keyword> orderKeywordsWrapper = new LambdaQueryWrapper<>();
                    orderKeywordsWrapper.eq(Keyword::getOrder_id, orderId);
                    List<Keyword> orderKeywords = keywordService.list(orderKeywordsWrapper);

                    if (orderKeywords.isEmpty()) {
                        System.out.println("订单[" + orderId + "]下无关键词，跳过状态更新");
                        return;
                    }

                    // 3. 检查所有关键词的状态是否均为 completed 或 false
                    boolean allValid = orderKeywords.stream()
                            .allMatch(k -> "completed".equals(k.getStatus()) || "false".equals(k.getStatus()));

                    // 4. 若所有关键词状态均有效，更新订单状态为3
                    if (allValid) {
                        Orders orders = orderService.getById(orderId);
                        if (orders != null) {
                            orders.setStatus(3); // 假设Orders有Integer类型的status字段
                            orderService.updateById(orders);
                            System.out.println("订单[" + orderId + "]所有关键词状态符合条件，已更新状态为3");
                        } else {
                            System.out.println("未找到订单[" + orderId + "]，无法更新状态");
                        }
                    }
                }
                Orders orders = orderService.getById(keyword.getOrder_id());

                // 2. 批量查询所有问题
                LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();