修改定时器抢占

guyue

4 天以前 faa95a5b183a42a6c3fcf1d6a41d81caa33da3bc

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

@@ -5,10 +5,13 @@
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;
@@ -25,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;
@@ -42,6 +42,10 @@
    private QuestionService questionService;
    @Autowired
    private KeywordService keywordService;
    @Autowired
    private KeywordMapper keywordMapper;
    @Autowired
    private ReferenceMapper referenceMapper;

    @PostMapping
    @ApiOperation(value = "添加提问词")
@@ -138,17 +142,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();
     }
@@ -163,6 +171,32 @@

    }

    @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);

//查有引用的
//        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("下载模板")