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/QuestionController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
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();
--
Gitblit v1.7.1