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 | 204 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 149 insertions(+), 55 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 b74394d..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,16 +1,36 @@
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.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.PaperQuestionDTO;
+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.vo.admin.exam.ExamResponseVO;
-import com.ycl.jxkg.enums.ExamPaperTypeEnum;
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.enums.QuestionTypeEnum;
import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.mapper.ExamPaperMapper;
import com.ycl.jxkg.mapper.QuestionMapper;
@@ -19,24 +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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.math.BigDecimal;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -53,25 +66,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void addPaper(ExamPaperForm form) {
- ExamPaper examPaper = ExamPaperForm.getEntityByForm(form,null);
- examPaper.setContent(JSON.toJSONString(form.getQuestionList()));
- baseMapper.insert(examPaper);
- //TODO:闅忓簭璇曞嵎鐢熸垚棰樼洰
-// if(ExamPaperTypeEnum.RandomOrder.getCode().equals(form.getPaperType())){
-// List<PaperQuestionDTO> questionList = form.getQuestionList();
-// List<PaperQuestion> list = questionMapper.selectQuestion();
-// }
+ public Result addPaper(ExamPaperForm form) {
+ ExamPaper examPaper = ExamPaperForm.getEntityByForm(form, null);
+ 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();
+ } else if (ExamPaperTypeEnum.Fixed.getCode().equals(form.getPaperType())) {
+ //鍥哄畾璇曞嵎
+ examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList()));
+ baseMapper.insert(examPaper);
+ return Result.ok();
+ } else {
+ //闅忓簭璇曞嵎
+ 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(), "璇曞嵎棰樼洰绫诲瀷涓嶈兘涓虹┖");
+ }
+ List<PaperFixQuestionDTO> questionTitleList = new ArrayList<>();
+ 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(questionTitleList));
+ baseMapper.insert(examPaper);
+ return Result.ok();
+ }
+ }
+ //杞崲鏁版嵁
+ 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());
+ }
+ questionList.add(paperQuestion);
+ }
}
+
@Override
- public void updateExamPaper(ExamPaperForm form) {
- ExamPaper entity = ExamPaperForm.getEntityByForm(form,null);
- baseMapper.updateById(entity);
+ public Result updateExamPaper(ExamPaperForm form) {
+ //TODO锛氶獙璇佹槸鍚︽槸璇曞嵎鍒涘缓浜�
+ ExamPaper examPaper = ExamPaperForm.getEntityByForm(form, null);
+ examPaper.setScore(new BigDecimal(form.getScore()));
+ //闅忔満璇曞嵎
+ if (ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())) {
+ examPaper.setContent(JSON.toJSONString(form.getQuestionSetting()));
+ baseMapper.updateById(examPaper);
+ return Result.ok();
+ } else if (ExamPaperTypeEnum.Fixed.getCode().equals(form.getPaperType())) {
+ //鍥哄畾璇曞嵎
+ examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList()));
+ baseMapper.updateById(examPaper);
+ return Result.ok();
+ } else {
+ //闅忓簭璇曞嵎
+ examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList()));
+ baseMapper.updateById(examPaper);
+ return Result.ok();
+ }
}
@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 -> {
@@ -79,7 +190,6 @@
BeanUtils.copyProperties(e, vo);
vo.setVisibility(VisibilityEnum.valueOf(vo.getVisibility()).getCode() + "");
vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- vo.setQuestionList(JSONArray.parseArray(e.getContent(),PaperQuestionDTO.class));
return vo;
});
return pageVO;
@@ -136,32 +246,17 @@
ExamPaper examPaper = examPaperMapper.selectById(id);
ExamPaperEditRequestVO vo = new ExamPaperEditRequestVO();
BeanUtils.copyProperties(examPaper, vo);
- //TODO:
-// TextContent frameTextContent = textContentService.getById(examPaper.getFrameTextContentId());
-// List<ExamPaperTitleItemObject> examPaperTitleItemObjects = JsonUtil.toJsonListObject(frameTextContent.getContent(), ExamPaperTitleItemObject.class);
-// List<Integer> questionIds = examPaperTitleItemObjects.stream()
-// .flatMap(t -> t.getQuestionItems().stream()
-// .map(q -> q.getId()))
-// .collect(Collectors.toList());
-// List<Question> questions = questionMapper.selectByIds(questionIds);
-// List<ExamPaperTitleItemVO> examPaperTitleItemVOS = examPaperTitleItemObjects.stream().map(t -> {
-// ExamPaperTitleItemVO tTitleVM = new ExamPaperTitleItemVO();
-// BeanUtils.copyProperties(t, tTitleVM);
-// List<QuestionEditRequestVO> questionItemsVM = t.getQuestionItems().stream().map(i -> {
-// Question question = questions.stream().filter(q -> q.getId().equals(i.getId())).findFirst().get();
-// QuestionEditRequestVO questionEditRequestVO = questionService.getQuestionEditRequestVM(question);
-// questionEditRequestVO.setItemOrder(i.getItemOrder());
-// return questionEditRequestVO;
-// }).collect(Collectors.toList());
-// tTitleVM.setQuestionItems(questionItemsVM);
-// return tTitleVM;
-// }).collect(Collectors.toList());
-// vo.setTitleItems(examPaperTitleItemVOS);
-// vo.setScore(ExamUtil.scoreToVM(examPaper.getScore()));
-// if (ExamPaperTypeEnum.Random == ExamPaperTypeEnum.fromCode(examPaper.getPaperType())) {
-// List<String> limitDateTime = Arrays.asList(DateTimeUtil.dateFormat(examPaper.getLimitStartTime()), DateTimeUtil.dateFormat(examPaper.getLimitEndTime()));
-// vo.setLimitDateTime(limitDateTime);
-// }
+ vo.setVisibility(VisibilityEnum.valueOf(vo.getVisibility()).getCode());
+ //闅忔満璇曞嵎
+ if (ExamPaperTypeEnum.Random.getCode().equals(examPaper.getPaperType())) {
+ vo.setQuestionSetting(JSONArray.parseArray(examPaper.getContent(), PaperQuestionSettingDTO.class));
+ } else if (ExamPaperTypeEnum.Fixed.getCode().equals(examPaper.getPaperType())) {
+ //鍥哄畾璇曞嵎
+ vo.setQuestionTitleList(JSONArray.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class));
+ } else {
+ //闅忓簭璇曞嵎
+ vo.setQuestionTitleList(JSONArray.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class));
+ }
return vo;
}
@@ -187,7 +282,6 @@
return null == keyValue ? 0 : keyValue.getValue();
}).collect(Collectors.toList());
}
-
private void examPaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, ExamPaper examPaper, List<ExamPaperTitleItemVO> titleItemsVM) {
--
Gitblit v1.8.0