From 23ac3e4f8fb16db0759ba5c91c4d06d622c67009 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 14 七月 2025 14:49:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/linghu/controller/CollectController.java | 4 ++--
src/main/java/com/linghu/controller/UserController.java | 4 ++--
src/main/java/com/linghu/controller/QuestionController.java | 15 +++++++++++++--
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/linghu/controller/CollectController.java b/src/main/java/com/linghu/controller/CollectController.java
index f435bea..1ad4f89 100644
--- a/src/main/java/com/linghu/controller/CollectController.java
+++ b/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();
diff --git a/src/main/java/com/linghu/controller/QuestionController.java b/src/main/java/com/linghu/controller/QuestionController.java
index 0d90313..97f50e0 100644
--- a/src/main/java/com/linghu/controller/QuestionController.java
+++ b/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();
diff --git a/src/main/java/com/linghu/controller/UserController.java b/src/main/java/com/linghu/controller/UserController.java
index fc4f197..8b086b9 100644
--- a/src/main/java/com/linghu/controller/UserController.java
+++ b/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("正常");
--
Gitblit v1.7.1