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 | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/linghu/controller/QuestionController.java b/src/main/java/com/linghu/controller/QuestionController.java
index 97f50e0..0c2090c 100644
--- a/src/main/java/com/linghu/controller/QuestionController.java
+++ b/src/main/java/com/linghu/controller/QuestionController.java
@@ -7,9 +7,11 @@
import com.linghu.listener.QuestionExcelListener;
import com.linghu.model.common.ResponseResult;
import com.linghu.model.dto.KeywordDto;
+import com.linghu.model.entity.Keyword;
import com.linghu.model.entity.Question;
import com.linghu.model.excel.KeywordExcel;
import com.linghu.model.excel.QuestionExcel;
+import com.linghu.service.KeywordService;
import com.linghu.service.QuestionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,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;
@@ -38,6 +37,8 @@
@Autowired
private QuestionService questionService;
+ @Autowired
+ private KeywordService keywordService;
@PostMapping
@ApiOperation(value = "添加提问词")
@@ -79,11 +80,11 @@
public ResponseResult<List<Question>> update(@RequestBody KeywordDto keywordDto) {
//查询question的状态
//遍历
- for (Question q : keywordDto.getQuestionList()) {
- if ("pending".equals(q.getStatus()) || "processing".equals(q.getStatus())) {
- return ResponseResult.error("有提问词在采集中");
+
+ if ("submitted".equals(keywordDto.getStatus()) ) {
+ return ResponseResult.error("该关键词在采集中");
}
- }
+
questionService.updateBatchById(keywordDto.getQuestionList());
// if (!"notSubmitted".equals(keywordDto.getStatus() )){
@@ -115,11 +116,14 @@
@ApiOperation(value = "修改单个提问词")
public ResponseResult<Void> update(@RequestBody Question questions) {
- if ("pending".equals(questions.getStatus()) || "processing".equals(questions.getStatus())) {
- return ResponseResult.error("该提问词在采集中");
- }
+ LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Question::getQuestion_id, questions.getQuestion_id());
+ Question keyword = questionService.getOne(queryWrapper);
+ if ("submitted".equals(keyword.getStatus()) ) {
+ return ResponseResult.error("该关键词在采集中");
+ }
- boolean success = questionService.updateById(questions);
+ boolean success = questionService.updateById(questions);
if (success) {
return ResponseResult.success();
}
@@ -130,13 +134,22 @@
@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("有提问词在采集中");
+
+
+ // 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