From c2a9635771370e7ec908db7e11a5cdd1b5f7bbf0 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 14 七月 2025 17:23:29 +0800
Subject: [PATCH] 修改删除提问词,用户添加和导入设置创建时间

---
 src/main/java/com/linghu/controller/QuestionController.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/linghu/controller/QuestionController.java b/src/main/java/com/linghu/controller/QuestionController.java
index cd11e19..0c2090c 100644
--- a/src/main/java/com/linghu/controller/QuestionController.java
+++ b/src/main/java/com/linghu/controller/QuestionController.java
@@ -25,10 +25,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
@@ -138,17 +135,21 @@
      @ApiOperation(value = "批量删除提问词")
      public ResponseResult<Void> batchDelete(@RequestBody List<Integer> questionIds) {
 
-        LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Question::getQuestion_id, questionIds);
-        List<Question> questions = questionService.list(queryWrapper);
-        Question question = questions.get(0);
-         Keyword keyword = keywordService.getById(question.getKeyword_id());
 
-
-         if ("submitted".equals(keyword.getStatus()) ) {
-             return ResponseResult.error("该关键词在采集中");
+         // 2. 批量查询所有提问词
+         List<Question> questions = questionService.listByIds(questionIds);
+         // 3. 校验所有提问词关联的关键词是否处于采集中
+         for (Question question : questions) {
+             Keyword keyword = keywordService.getById(question.getKeyword_id());
+             // 关键词不存在也需处理(可选)
+             if (keyword == null) {
+                 return ResponseResult.error("提问词关联的关键词不存在,ID:" + question.getKeyword_id());
+             }
+             // 核心校验:若有任何关键词在采集中,禁止删除
+             if ("submitted".equals(keyword.getStatus())) {
+                 return ResponseResult.error("该关键词在采集中,无法删除");
+             }
          }
-             System.out.println(questionIds.toString());
         questionService.removeByIds(questionIds);
         return ResponseResult.success();
      }

--
Gitblit v1.7.1