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 | 118 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/linghu/controller/QuestionController.java b/src/main/java/com/linghu/controller/QuestionController.java
index 5b6732f..0c2090c 100644
--- a/src/main/java/com/linghu/controller/QuestionController.java
+++ b/src/main/java/com/linghu/controller/QuestionController.java
@@ -2,13 +2,16 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
@@ -22,11 +25,10 @@
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;
@RestController
@RequestMapping("/question")
@@ -35,6 +37,8 @@
@Autowired
private QuestionService questionService;
+ @Autowired
+ private KeywordService keywordService;
@PostMapping
@ApiOperation(value = "添加提问词")
@@ -74,57 +78,81 @@
@ApiOperation(value = "修改提问词")
@Transactional
public ResponseResult<List<Question>> update(@RequestBody KeywordDto keywordDto) {
- if (!"notSubmitted".equals(keywordDto.getStatus() )){
- return ResponseResult.error("该关键词已提交或者已采集完成不允许修改提问词！");
- }
- LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Question::getKeyword_id, keywordDto.getKeyword_id());
- questionService.remove(queryWrapper);
+ //查询question的状态
+ //遍历
- List<Question> questionList = Arrays.stream(keywordDto.getQuestions().split("\\n"))
- .filter(q -> !q.trim().isEmpty())
- .map(q -> {
- Question question = new Question();
- question.setKeyword_id(keywordDto.getKeyword_id());
- question.setQuestion(q.trim());
- question.setStatus("pending");
+ if ("submitted".equals(keywordDto.getStatus()) ) {
+ return ResponseResult.error("该关键词在采集中");
+ }
- return question;
- }).collect(Collectors.toList());
+ questionService.updateBatchById(keywordDto.getQuestionList());
- questionService.saveBatch(questionList);
+// if (!"notSubmitted".equals(keywordDto.getStatus() )){
+// return ResponseResult.error("该关键词已提交或者已采集完成不允许修改提问词！");
+// }
+// LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();
+// queryWrapper.eq(Question::getKeyword_id, keywordDto.getKeyword_id());
+// questionService.remove(queryWrapper);
+
+// List<Question> questionList = Arrays.stream(keywordDto.getQuestions().split("\\n"))
+// .filter(q -> !q.trim().isEmpty())
+// .map(q -> {
+// Question question = new Question();
+// question.setKeyword_id(keywordDto.getKeyword_id());
+// question.setQuestion(q.trim());
+// question.setStatus("pending");
+//
+// return question;
+// }).collect(Collectors.toList());
+
+// questionService.saveBatch(questionList);
return ResponseResult.success();
}
-// @PutMapping
-// @ApiOperation(value = "修改提问词")
-// public ResponseResult<Void> update(@RequestBody Question questions) {
-// boolean success = questionService.updateById(questions);
-// if (success) {
-// return ResponseResult.success();
-// }
-// return ResponseResult.error("更新提问词失败");
-// }
+ @PutMapping("/update")
+ @ApiOperation(value = "修改单个提问词")
+ public ResponseResult<Void> update(@RequestBody Question questions) {
- // @DeleteMapping("/batch")
- // @Transactional
- // public ResponseResult<Void> batchDelete(@RequestBody List<Integer>
- // questionIds) {
- // List<Question> questions = questionIds.stream().map(id -> {
- // Question question = new Question();
- // question.setQuestion_id(id);
- // return question;
- // }).collect(Collectors.toList());
+ 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.updateBatchById(questions);
- // if (success) {
- // return ResponseResult.success();
- // }
- // return ResponseResult.error("批量删除提问词失败");
- // }
+ boolean success = questionService.updateById(questions);
+ if (success) {
+ return ResponseResult.success();
+ }
+ return ResponseResult.error("更新提问词失败");
+ }
+
+ @DeleteMapping("/batch")
+ @Transactional
+ @ApiOperation(value = "批量删除提问词")
+ public ResponseResult<Void> batchDelete(@RequestBody List<Integer> questionIds) {
+
+
+ // 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("该关键词在采集中，无法删除");
+ }
+ }
+ questionService.removeByIds(questionIds);
+ return ResponseResult.success();
+ }
@GetMapping("/list")
@ApiOperation("根据关键词查询提问词列表")
@@ -144,7 +172,7 @@
EasyExcel.write(out, QuestionExcel.class).sheet("提问词模板").doWrite(new ArrayList<>());
return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=question_template.xlsx")
+ .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=提问词条导入模板.xlsx")
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.body(out.toByteArray());
}
--
Gitblit v1.7.1