From ff1fec7eae681e89e607fd441d2597ab67b5ed2a Mon Sep 17 00:00:00 2001 From: guyue <1721849008@qq.com> Date: 星期二, 12 八月 2025 19:04:34 +0800 Subject: [PATCH] 修改查看时间和删除关键词 --- src/main/java/com/linghu/service/impl/QuestionServiceImpl.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/linghu/service/impl/QuestionServiceImpl.java b/src/main/java/com/linghu/service/impl/QuestionServiceImpl.java index c411f9d..fccec91 100644 --- a/src/main/java/com/linghu/service/impl/QuestionServiceImpl.java +++ b/src/main/java/com/linghu/service/impl/QuestionServiceImpl.java @@ -3,6 +3,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.linghu.config.FinalStatus; import com.linghu.listener.QuestionExcelListener; import com.linghu.mapper.KeywordMapper; import com.linghu.mapper.ReferenceMapper; @@ -20,6 +21,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; import java.io.ByteArrayOutputStream; @@ -52,7 +54,7 @@ Question question = new Question(); question.setKeyword_id(keywordDto.getKeyword_id()); question.setQuestion(q.trim()); - question.setStatus("pending"); + question.setStatus(FinalStatus.PENDING.getValue()); return question; }).collect(Collectors.toList()); @@ -69,7 +71,7 @@ LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Question::getQuestion_id, questions.getQuestion_id()); Question keyword = this.getOne(queryWrapper); - if ("submitted".equals(keyword.getStatus()) ) { + if (FinalStatus.SUBMITTED.getValue().equals(keyword.getStatus()) ) { return ResponseResult.error("该关键词在采集中"); } @@ -82,6 +84,10 @@ @Override public ResponseResult<Void> batchDeleteQuestion(List<Integer> questionIds) { + // 新增判断:如果集合为空,直接返回错误 + if (CollectionUtils.isEmpty(questionIds)) { + return ResponseResult.error("删除失败,至少选择一个提问词"); + } // 2. 批量查询所有提问词 List<Question> questions = this.listByIds(questionIds); // 3. 校验所有提问词关联的关键词是否处于采集中 @@ -92,7 +98,7 @@ return ResponseResult.error("提问词关联的关键词不存在,ID:" + question.getKeyword_id()); } // 核心校验:若有任何关键词在采集中,禁止删除 - if ("submitted".equals(keyword.getStatus())) { + if (FinalStatus.PENDING.getValue().equals(keyword.getStatus())) { return ResponseResult.error("该关键词在采集中,无法删除"); } } @@ -146,7 +152,7 @@ @Override public ResponseResult<List<Question>> updateQuestion(KeywordDto keywordDto) { - if ("submitted".equals(keywordDto.getStatus()) ) { + if (FinalStatus.SUBMITTED.getValue().equals(keywordDto.getStatus()) ) { return ResponseResult.error("该关键词在采集中"); } this.updateBatchById(keywordDto.getQuestionList()); -- Gitblit v1.7.1