bug修改

huliguo

2025-07-16 6727c89745faa938cc053fa67ea3b9f819f5cbfe

 src/main/java/com/linghu/controller/QuestionController.java

@@ -5,11 +5,16 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.linghu.listener.QuestionExcelListener;
import com.linghu.mapper.KeywordMapper;
import com.linghu.mapper.ReferenceMapper;
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.entity.Reference;
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 +28,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 +40,12 @@

    @Autowired
    private QuestionService questionService;
    @Autowired
    private KeywordService keywordService;
    @Autowired
    private KeywordMapper keywordMapper;
    @Autowired
    private ReferenceMapper referenceMapper;

    @PostMapping
    @ApiOperation(value = "添加提问词")
@@ -79,11 +87,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 +123,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 +141,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();
     }
@@ -151,6 +171,31 @@

    }

    @GetMapping("/notNullList")
    @ApiOperation("根据关键词查询提问词列表")
    public ResponseResult<List<Question>> notNullList(Integer keyword_id) {
        Keyword keyword = keywordMapper.selectById(keyword_id);

        List<Reference> references = referenceMapper.selectList(new LambdaQueryWrapper<Reference>()
                .eq(Reference::getKeyword_id, keyword_id)
                .eq(Reference::getNum, keyword.getNum()));
        List<Integer> questionIds = references.stream().map(Reference::getQuestion_id).distinct().collect(Collectors.toList());
        // 查询success状态的 当前轮数的
        LambdaQueryWrapper<Question> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Question::getKeyword_id, keyword_id);
        queryWrapper.eq(Question::getStatus, "success");
        if ( !questionIds.isEmpty()) {
            queryWrapper.in(Question::getQuestion_id, questionIds);
        }else {
            return ResponseResult.success(new ArrayList<>());
        }


        List<Question> list = questionService.list(queryWrapper);
        return ResponseResult.success(list);

    }

    // 下载模板
    @PostMapping("/downloadTemplate")
    @ApiOperation("下载模板")