From b19d7869a20efec118e6e2b3384b43b53e3ffb27 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 14 五月 2024 17:28:11 +0800
Subject: [PATCH] feat：答卷统计新需求
---
src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java | 90 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java
index e7305d3..dba31af 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java
@@ -9,9 +9,13 @@
import com.mindskip.xzs.domain.ExamPaperAnswer;
import com.mindskip.xzs.domain.Question;
import com.mindskip.xzs.domain.SelfPractice;
+import com.mindskip.xzs.domain.enums.PracticeQuestionTypeEnum;
+import com.mindskip.xzs.domain.enums.PracticeTypeEnum;
+import com.mindskip.xzs.domain.enums.QuestionTypeEnum;
import com.mindskip.xzs.domain.vo.QuestionContentVO;
import com.mindskip.xzs.domain.vo.QuestionVO;
import com.mindskip.xzs.domain.vo.SelfPracticeVO;
+import com.mindskip.xzs.domain.vo.SubjectQuestionVO;
import com.mindskip.xzs.repository.QuestionMapper;
import com.mindskip.xzs.repository.QuestionSubjectMapper;
import com.mindskip.xzs.repository.SelfPracticeMapper;
@@ -23,6 +27,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -87,26 +92,37 @@
if (Objects.isNull(en)) {
throw new RuntimeException("缁冧範涓嶅瓨鍦�");
}
- if (StringUtils.hasText(en.getQuestionIds())) {
- // 鐢熸垚浜嗛鐩氨鐩存帴鏌�
- List<Integer> questionIdList = JSON.parseArray(en.getQuestionIds(), Integer.class);
- List<QuestionVO> vos = questionMapper.getVoByIds(questionIdList);
- jsonQuestion(vos);
- return RestResponse.ok(vos);
- } else {
- // 娌＄敓鎴愯繃灏遍殢鏈虹敓鎴愰鐩�
- List<Integer> subjectIds = JSON.parseArray(en.getSubjects(), Integer.class);
- Integer totalQuestionNum = questionSubjectMapper.countQuestionNum(subjectIds);
- if (totalQuestionNum < en.getQuestionNum()) {
- throw new RuntimeException("浣犳墍閫夌殑璇剧洰棰樼洰鏁伴噺涓嶈冻");
+ List<Integer> subjectIds = JSON.parseArray(en.getSubjects(), Integer.class);
+ if (PracticeTypeEnum.ORDERED.getValue().equals(en.getPracticeType())) {
+ List<SubjectQuestionVO> list = new ArrayList<>(2);
+ // 椤哄簭鍋氶锛屾妸閫夋嫨鐨勯搴撶殑棰�(id)鍏ㄩ儴鏌ュ嚭鏉ワ紝鍓嶇鏈変釜搴忓彿闈㈡澘锛岀偣鍑诲摢閬撻鍋氬摢閬�
+ for (Integer subjectId : subjectIds) {
+ String subjectName = subjectMapper.selectSubjectNameById(subjectId);
+ // todo鏍规嵁鍋氶璁板綍鏌ヨ鍋氭病鍋氳繃
+ List<Integer> questionIds = new ArrayList<>();
+ if (PracticeQuestionTypeEnum.ALL.getValue().equals(en.getQuestionType())) {
+ questionIds = questionSubjectMapper.questionsBySubjectId(subjectId);
+ } else {
+ questionIds = questionSubjectMapper.questionsBySubjectIdAndQuestionType(subjectId, PracticeQuestionTypeEnum.getDataBaseValueByValue(en.getQuestionType()));
+ }
+ SubjectQuestionVO subjectQuestionVO = new SubjectQuestionVO();
+ subjectQuestionVO.setSubjectId(subjectId);
+ subjectQuestionVO.setSubjectName(subjectName);
+ subjectQuestionVO.setQuestionIds(questionIds);
+ list.add(subjectQuestionVO);
}
- // 鏌ヨ鍑鸿鐩笅闅忔満鐨勮瀹氭暟閲忛鐩�
- List<QuestionVO> questionVOList = questionSubjectMapper.getRandomQuestionId(subjectIds, en.getQuestionNum());
- List<Integer> ids = questionVOList.stream().map(QuestionVO::getId).collect(Collectors.toList());
- selfPracticeMapper.setQuestionIds(en.getId(), JSON.toJSONString(ids));
- jsonQuestion(questionVOList);
- return RestResponse.ok(questionVOList);
+ return RestResponse.ok(list);
+ } else if (PracticeTypeEnum.RANDOM.getValue().equals(en.getPracticeType())) {
+ // 闅忔満缁冧範锛屾槸涓�閬撻涓�閬撻缁冧範
+ 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);
}
+ return RestResponse.ok();
}
@Override
@@ -115,18 +131,42 @@
return RestResponse.ok(num);
}
+ @Override
+ public RestResponse randomOneQuestion(Integer id) {
+ SelfPractice en = selfPracticeMapper.selectById(id);
+ if (Objects.isNull(en)) {
+ throw new RuntimeException("缁冧範涓嶅瓨鍦�");
+ }
+ List<Integer> subjectIds = JSON.parseArray(en.getSubjects(), Integer.class);
+ 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 vos
+ * @param questionVO
*/
- public void jsonQuestion(List<QuestionVO> vos) {
- vos.stream().forEach(vo -> {
- if (StringUtils.hasText(vo.getContentJson())) {
- QuestionContentVO questionContent = JSON.parseObject(vo.getContentJson(), QuestionContentVO.class);
- vo.setContent(questionContent);
+ 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())) {
+ questionVO.setAnswerNum(questionVO.getCorrect().split(",").length);
}
- });
+ }
+ questionVO.setContentJson("");
+ questionVO.setCorrect("");
+ questionVO.getContent().setCorrect("");
+ questionVO.getContent().setAnalyze("");
}
}
--
Gitblit v1.8.0