xiangpei
2024-05-14 d3d1235bab219b382a5bebfe34edabbba52d151c
在线练习多选题处理
2个文件已修改
37 ■■■■ 已修改文件
src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java
@@ -35,7 +35,7 @@
    Integer countQuestionNum(@Param("subjects") List<Integer> subjects);
    /** 随机题目 */
    List<QuestionVO> getRandomQuestionId(@Param("subjectIds") List<Integer> subjectIds, @Param("questionNum") Integer questionNum);
    List<QuestionVO> getRandomQuestionId(@Param("subjectIds") List<Integer> subjectIds, @Param("questionType") Integer questionType, @Param("questionNum") Integer questionNum);
    /** 查询题目ID,根据课目ids */
    List<Integer> questionsBySubjectIds(@Param("subjectIds") List<Integer> subjectIds);
src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java
@@ -114,11 +114,13 @@
            return RestResponse.ok(list);
        } else if (PracticeTypeEnum.RANDOM.getValue().equals(en.getPracticeType())) {
            // 随机练习,是一道题一道题练习
            List<QuestionVO> one = questionSubjectMapper.getRandomQuestionId(subjectIds, 1);
            List<QuestionVO> one = questionSubjectMapper.getRandomQuestionId(subjectIds, PracticeQuestionTypeEnum.getDataBaseValueByValue(en.getQuestionType()), 1);
            if (one.size() < 1) {
                throw new RuntimeException("没有找到题目,可能所选课目包含题目不足");
            }
            return RestResponse.ok(one.get(0));
            QuestionVO questionVO = one.get(0);
            jsonQuestion(questionVO);
            return RestResponse.ok(questionVO);
        }
        return RestResponse.ok();
    }
@@ -136,12 +138,26 @@
            throw new RuntimeException("练习不存在");
        }
        List<Integer> subjectIds = JSON.parseArray(en.getSubjects(), Integer.class);
        List<QuestionVO> one = questionSubjectMapper.getRandomQuestionId(subjectIds, 1);
        List<QuestionVO> one = questionSubjectMapper.getRandomQuestionId(subjectIds, PracticeQuestionTypeEnum.getDataBaseValueByValue(en.getQuestionType()), 1);
        if (one.size() < 1) {
            throw new RuntimeException("没有找到题目,可能所选课目包含题目不足");
        }
        QuestionVO questionVO = one.get(0);
        jsonQuestion(questionVO);
        return RestResponse.ok(questionVO);
    }
    /**
     * 处理题目内容JSON
     *
     * @param questionVO
     */
    public void jsonQuestion(QuestionVO questionVO) {
        if (StringUtils.hasText(questionVO.getContentJson())) {
            QuestionContentVO questionContent = JSON.parseObject(questionVO.getContentJson(), QuestionContentVO.class);
            questionVO.setContent(questionContent);
        }
        if (QuestionTypeEnum.MultipleChoice.getCode().equals(questionVO.getQuestionType())) {
            // 多选题需要返回答案数量,学员选中对应数量才查询答案
            if (StringUtils.hasText(questionVO.getCorrect())) {
@@ -152,18 +168,5 @@
        questionVO.setCorrect("");
        questionVO.getContent().setCorrect("");
        questionVO.getContent().setAnalyze("");
        return RestResponse.ok(questionVO);
    }
    /**
     * 处理题目内容JSON
     *
     * @param vo
     */
    public void jsonQuestion(QuestionVO vo) {
        if (StringUtils.hasText(vo.getContentJson())) {
            QuestionContentVO questionContent = JSON.parseObject(vo.getContentJson(), QuestionContentVO.class);
            vo.setContent(questionContent);
        }
    }
}