From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 158 +++++++++++++++++++++++++---------------------------
1 files changed, 75 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
index c2eb800..40b3d69 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -1,28 +1,35 @@
package com.ycl.jxkg.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.jxkg.base.Result;
-import com.ycl.jxkg.base.SystemCode;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.context.WebContext;
+import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.domain.exam.PaperFixQuestionDTO;
import com.ycl.jxkg.domain.exam.PaperQuestion;
import com.ycl.jxkg.domain.exam.PaperQuestionSettingDTO;
+import com.ycl.jxkg.domain.exam.PaperSettingItem;
import com.ycl.jxkg.domain.form.ExamPaperForm;
+import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.question.QuestionItemObject;
+import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.domain.question.RandomQuestionDTO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperTitleItemVO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter;
import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo;
import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO;
import com.ycl.jxkg.enums.ExamPaperTypeEnum;
-import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.mapper.ExamPaperMapper;
@@ -32,27 +39,17 @@
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.service.TextContentService;
import com.ycl.jxkg.utils.DateTimeUtil;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperTitleItemVO;
-import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter;
-import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo;
-import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.ycl.jxkg.domain.entity.ExamPaper;
+import com.ycl.jxkg.utils.JsonUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.util.*;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
import java.util.stream.Collectors;
@Service
@@ -74,6 +71,27 @@
examPaper.setScore(new BigDecimal(form.getScore()));
//闅忔満璇曞嵎
if (ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())) {
+ //鏍￠獙棰樼洰鏁伴噺
+ List<PaperQuestionSettingDTO> questionSetting = form.getQuestionSetting();
+ for (PaperQuestionSettingDTO settingDTO : questionSetting) {
+ Integer questionType = settingDTO.getQuestionType();
+ for (PaperSettingItem item : settingDTO.getSettingList()) {
+ Integer num = item.getNum();
+ Integer difficult = item.getDifficult();
+ //闇�瑕侀厤缃殑棰樼洰鏁伴噺涓�0鍒欒烦杩�
+ if(num ==null || num ==0 )continue;
+ //鍓嶇榛樿鏁版嵁涓�0锛岃浆鎹负null
+ if (0 == item.getDifficult()){
+ difficult= null;
+ }
+ RandomQuestionDTO randomQuestionDTO = new RandomQuestionDTO();
+ randomQuestionDTO.setQuestionType(questionType);
+ randomQuestionDTO.setSubjectId(item.getSubjectId());
+ randomQuestionDTO.setDifficult(difficult);
+ Integer numInData = questionMapper.selectByDifAndSub(randomQuestionDTO);
+ if(num > numInData)return Result.fail(SystemCode.InnerError.getCode(), QuestionTypeEnum.fromCode(questionType).getName()+"闅惧害涓�"+item.getDifficult()+"鐨勯鐩暟閲忎笉瓒�");
+ }
+ }
examPaper.setContent(JSON.toJSONString(form.getQuestionSetting()));
baseMapper.insert(examPaper);
return Result.ok();
@@ -84,92 +102,64 @@
return Result.ok();
} else {
//闅忓簭璇曞嵎
- Integer subjectId = form.getSubjectId();
- //棰樼洰閰嶇疆
List<PaperQuestionSettingDTO> questionSetting = form.getQuestionSetting();
//棰樼洰閰嶇疆閲岄厤鐨勮瘯鍗风被鍨�
List<Integer> types = questionSetting.stream().map(PaperQuestionSettingDTO::getQuestionType).collect(Collectors.toList());
if (CollectionUtils.isEmpty(types)) {
return Result.fail(SystemCode.InnerError.getCode(), "璇曞嵎棰樼洰绫诲瀷涓嶈兘涓虹┖");
}
- Map<Integer, List<Integer>> map = questionMapper.selectBySubject(subjectId, types)
- .stream().collect(Collectors.groupingBy(RandomQuestionDTO::getQuestionType, Collectors.mapping(RandomQuestionDTO::getQuestionId, Collectors.toList())));
List<PaperFixQuestionDTO> questionTitleList = new ArrayList<>();
- // 閬嶅巻map
- for (Integer questionType : map.keySet()) {
- //鏁版嵁搴撻噷鐨勮繖涓被鍨嬬殑棰樼洰
- List<Integer> questionIdList = map.get(questionType);
- Result InnerError1 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.SingleChoice.getCode());
- if (InnerError1 != null) return InnerError1;
- Result InnerError2 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.MultipleChoice.getCode());
- if (InnerError2 != null) return InnerError2;
- Result InnerError3 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.TrueFalse.getCode());
- if (InnerError3 != null) return InnerError3;
- Result InnerError4 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.GapFilling.getCode());
- if (InnerError4 != null) return InnerError4;
- Result InnerError5 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.ShortAnswer.getCode());
- if (InnerError5 != null) return InnerError5;
- Result InnerError6 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.Calculate.getCode());
- if (InnerError6 != null) return InnerError6;
+ for (PaperQuestionSettingDTO settingDTO : questionSetting) {
+ List<PaperSettingItem> settingList = settingDTO.getSettingList();
+ List<PaperQuestion> questionList = new ArrayList<>();
+ for (PaperSettingItem item : settingList) {
+ Integer num = item.getNum();
+ Integer difficult = item.getDifficult();
+ //闇�瑕侀厤缃殑棰樼洰鏁伴噺涓�0鍒欒烦杩�
+ if(num ==null || num ==0 )continue;
+ //鍓嶇榛樿鏁版嵁涓�0锛岃浆鎹负null
+ if (0 == difficult){
+ difficult = null;
+ }
+ List<Question> questions = questionMapper.getRandomQuestion(item.getSubjectId(), settingDTO.getQuestionType(), difficult, item.getNum());
+ if (CollectionUtils.isEmpty(questions) || item.getNum() > questions.size()) {
+ return Result.fail(SystemCode.InnerError.getCode(), QuestionTypeEnum.fromCode(settingDTO.getQuestionType()).getName()+"闅惧害涓猴細"+item.getDifficult()+"鐨勯鐩暟閲忎笉瓒�");
+ }
+ //杞崲鏁版嵁
+ convert(questionList, item, questions);
+ }
+ PaperFixQuestionDTO dto = new PaperFixQuestionDTO();
+ dto.setTitle(settingDTO.getTitle());
+ dto.setQuestionType(settingDTO.getQuestionType());
+ dto.setQuestionList(questionList);
+ questionTitleList.add(dto);
}
- examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList()));
+ examPaper.setContent(JSON.toJSONString(questionTitleList));
baseMapper.insert(examPaper);
return Result.ok();
}
}
- //鐢熸垚棰樼洰
- private Result createQuestion(List<PaperQuestionSettingDTO> questionSetting, List<PaperFixQuestionDTO> questionTitleList, Integer questionType, List<Integer> questionIdList , Integer questionEnumCode) {
- if (questionType.equals(questionEnumCode)) {
- //寰幆鎵惧埌瀵瑰簲棰樼洰
- PaperQuestionSettingDTO settingDTO = new PaperQuestionSettingDTO();
- for (PaperQuestionSettingDTO dto : questionSetting) {
- if (dto.getQuestionType().equals(questionType)) {
- settingDTO = dto;
- }
+ //杞崲鏁版嵁
+ private void convert(List<PaperQuestion> questionList, PaperSettingItem item, List<Question> questions) {
+ for (Question question : questions) {
+ PaperQuestion paperQuestion = new PaperQuestion();
+ BeanUtils.copyProperties(question,paperQuestion);
+ paperQuestion.setScore(item.getScore());
+ //杞崲
+ QuestionObject questionObject = JSONObject.parseObject(question.getContent(), QuestionObject.class);
+ if(questionObject != null){
+ paperQuestion.setItems(questionObject.getQuestionItemObjects());
+ paperQuestion.setAnalyze(questionObject.getAnalyze());
+ paperQuestion.setTitle(questionObject.getTitleContent());
}
- // 闇�瑕佺敓鎴愮殑棰樼洰鏁伴噺
- Integer num = settingDTO.getNum();
- if(num ==0){
- //棰樼洰閰嶇疆姝ょ被鍨嬫暟閲忎负0锛岃烦杩囷紝涓嶇敓鎴愰鐩��
- return null;
- }
- if (CollectionUtils.isEmpty(questionIdList) || num > questionIdList.size()) {
- return Result.fail(SystemCode.InnerError.getCode(), "棰樼洰鏁伴噺涓嶈冻");
- }
- // 浣跨敤Random绫荤敓鎴愪笉閲嶅鐨勯殢鏈虹储寮�
- Set<Integer> indexes = new HashSet<>();
- Random random = new Random();
- while (indexes.size() < num) {
- int index = random.nextInt(questionIdList.size());
- indexes.add(index);
- }
- // 鏍规嵁绱㈠紩鑾峰彇棰樼洰
- List<Integer> questionIds = new ArrayList<>();
- for (int index : indexes) {
- questionIds.add(questionIdList.get(index));
- }
- QueryWrapper<Question> wrapper = new QueryWrapper<>();
- wrapper.in("id",questionIds);
- List<Question> questions = questionMapper.selectList(wrapper);
- List<PaperQuestion> questionList = new ArrayList<>();
- for (Question question : questions) {
- PaperQuestion paperQuestion = new PaperQuestion();
- BeanUtils.copyProperties(question,paperQuestion);
- paperQuestion.setScore(settingDTO.getScore());
- paperQuestion.setItems(JSONArray.parseArray(question.getContent(), QuestionItemObject.class));
- questionList.add(paperQuestion);
- }
- PaperFixQuestionDTO dto = new PaperFixQuestionDTO();
- dto.setTitle(settingDTO.getTitle());
- dto.setQuestionType(questionType);
- dto.setQuestionList(questionList);
- questionTitleList.add(dto);
+ questionList.add(paperQuestion);
}
- return null;
}
+
@Override
public Result updateExamPaper(ExamPaperForm form) {
+ //TODO锛氶獙璇佹槸鍚︽槸璇曞嵎鍒涘缓浜�
ExamPaper examPaper = ExamPaperForm.getEntityByForm(form, null);
examPaper.setScore(new BigDecimal(form.getScore()));
//闅忔満璇曞嵎
@@ -192,6 +182,7 @@
@Override
public PageInfo<ExamResponseVO> page(ExamPaperPageRequestVO requestVM) {
+ //TODO: 鏁版嵁鏉冮檺
PageInfo<ExamPaper> page = PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
examPaperMapper.page(requestVM));
PageInfo<ExamResponseVO> pageVO = PageInfoHelper.copyMap(page, e -> {
@@ -264,6 +255,7 @@
vo.setQuestionTitleList(JSONArray.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class));
} else {
//闅忓簭璇曞嵎
+ vo.setQuestionTitleList(JSONArray.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class));
}
return vo;
}
--
Gitblit v1.8.0