Merge remote-tracking branch 'origin/master'

huliguo

75 分钟以前 23ac3e4f8fb16db0759ba5c91c4d06d622c67009

Merge remote-tracking branch 'origin/master'

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

@@ -642,13 +642,13 @@
//                if (keywordTasks.stream().allMatch(task ->
//                        "completed".equals(task.getStatus()) || "false".equals(task.getStatus()) || "canceled".equals(task.getStatus())
//                )) {
                    keyword.setStatus("canceled");
//                    keyword.setStatus("canceled");
                    keywordService.updateById(keyword);
//                    log.info("关键词 {} 所有任务已完成，更新状态为 completed", keywordId);
//                }
                //更新提问词状态为取消

                questionService.update(new LambdaUpdateWrapper<Question>().eq(Question::getKeyword_id, keywordId).set(Question::getStatus, "canceled"));
                questionService.update(new LambdaUpdateWrapper<Question>().eq(Question::getKeyword_id, keywordId).isNull(Question::getResponse).set(Question::getStatus, "canceled"));

                // 更新订单状态
                String orderId = keyword.getOrder_id();

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

@@ -80,8 +80,8 @@
        //查询question的状态
       //遍历
        for (Question q : keywordDto.getQuestionList()) {
            if ("success".equals(q.getStatus())) {
                return ResponseResult.error("该提问词已采集");
            if ("pending".equals(q.getStatus()) || "processing".equals(q.getStatus())) {
                return ResponseResult.error("有提问词在采集中");
            }
        }
         questionService.updateBatchById(keywordDto.getQuestionList());
@@ -114,6 +114,11 @@
    @PutMapping("/update")
    @ApiOperation(value = "修改单个提问词")
    public ResponseResult<Void> update(@RequestBody Question questions) {

            if ("pending".equals(questions.getStatus()) || "processing".equals(questions.getStatus())) {
                return ResponseResult.error("该提问词在采集中");
            }

        boolean success = questionService.updateById(questions);
        if (success) {
            return ResponseResult.success();
@@ -125,6 +130,12 @@
     @Transactional
     @ApiOperation(value = "批量删除提问词")
     public ResponseResult<Void> batchDelete(@RequestBody List<Integer> questionIds) {
        List<Question> questions = questionService.listByIds(questionIds);
         for (Question q : questions) {
             if ("pending".equals(q.getStatus()) || "processing".equals(q.getStatus())) {
                 return ResponseResult.error("有提问词在采集中");
             }
         }
         System.out.println(questionIds.toString());
        questionService.removeByIds(questionIds);
        return ResponseResult.success();

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

@@ -57,7 +57,7 @@
    public ResponseResult add(@RequestBody User user) {
        List<User> list = userService.list(new LambdaQueryWrapper<User>().eq(User::getUser_email, user.getUser_email()));
        if (list != null && list.size() > 0) {
            return ResponseResult.success("该邮箱已存在");
            return ResponseResult.error("该邮箱已存在");
        }
        user.setStatus("正常");
        userService.save(user);
@@ -80,7 +80,7 @@
                        .ne(User::getUser_id, user.getUser_id())
                .eq(User::getUser_email, user.getUser_email()));
        if (list != null && list.size() > 0) {
            return ResponseResult.success("该邮箱已存在");
            return ResponseResult.error("该邮箱已存在");
        }
        if (!user1.getUser_email().equals(user.getUser_email())||!user1.getPassword().equals(user.getPassword())) {
            user.setStatus("正常");