From ff72e1d0b87a6a52330baa620656dc0f1c4cfc8b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 17 六月 2024 13:51:27 +0800
Subject: [PATCH] 试卷模块
---
src/main/java/com/ycl/jxkg/domain/exam/PaperQuestion.java | 6 +++
src/main/java/com/ycl/jxkg/domain/exam/PaperQuestionSettingDTO.java | 2
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 59 +++++++++++++++++++----------
3 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/exam/PaperQuestion.java b/src/main/java/com/ycl/jxkg/domain/exam/PaperQuestion.java
index 35ea15b..7eb7344 100644
--- a/src/main/java/com/ycl/jxkg/domain/exam/PaperQuestion.java
+++ b/src/main/java/com/ycl/jxkg/domain/exam/PaperQuestion.java
@@ -21,4 +21,10 @@
private String correct;
+ private String analyze;
+
+ //璇煶棰樻枃浠跺悕
+ private String audioFile;
+ //璇煶棰樺師濮嬪悕
+ private String originalFile;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/exam/PaperQuestionSettingDTO.java b/src/main/java/com/ycl/jxkg/domain/exam/PaperQuestionSettingDTO.java
index e2752ec..8e71555 100644
--- a/src/main/java/com/ycl/jxkg/domain/exam/PaperQuestionSettingDTO.java
+++ b/src/main/java/com/ycl/jxkg/domain/exam/PaperQuestionSettingDTO.java
@@ -7,7 +7,7 @@
@Data
public class PaperQuestionSettingDTO {
- //鏍囬(鍗曢�夐銆佸垽鏂)
+ //鏍囬(鍗曢�夐(20鍒�)...)
private String title;
//棰樼洰绫诲埆
private Integer questionType;
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..37e4ce7 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,34 @@
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.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 +38,16 @@
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 java.math.BigDecimal;
import java.util.*;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
import java.util.stream.Collectors;
@Service
@@ -74,6 +69,21 @@
examPaper.setScore(new BigDecimal(form.getScore()));
//闅忔満璇曞嵎
if (ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())) {
+ //鏍￠獙棰樼洰鏁伴噺
+ List<PaperQuestionSettingDTO> questionSetting = form.getQuestionSetting();
+ //棰樼洰閰嶇疆閲岄厤鐨勮瘯鍗风被鍨�
+ List<Integer> types = questionSetting.stream().map(PaperQuestionSettingDTO::getQuestionType).collect(Collectors.toList());
+ Map<Integer, List<Integer>> map = questionMapper.selectBySubject(form.getSubjectId(), types)
+ .stream().collect(Collectors.groupingBy(RandomQuestionDTO::getQuestionType, Collectors.mapping(RandomQuestionDTO::getQuestionId, Collectors.toList())));
+
+ for (PaperQuestionSettingDTO settingDTO : questionSetting) {
+ Integer num = settingDTO.getNum();
+ Integer questionType = settingDTO.getQuestionType();
+ //闇�瑕侀厤缃殑棰樼洰鏁伴噺涓�0鍒欒烦杩�
+ if(num ==null || num ==0 )continue;
+ List<Integer> questions = map.get(questionType);
+ if(CollectionUtils.isEmpty(questions) || num > questions.size())return Result.fail(SystemCode.InnerError.getCode(), QuestionTypeEnum.fromCode(questionType).getName()+"棰樼洰鏁伴噺涓嶈冻");
+ }
examPaper.setContent(JSON.toJSONString(form.getQuestionSetting()));
baseMapper.insert(examPaper);
return Result.ok();
@@ -112,7 +122,7 @@
Result InnerError6 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.Calculate.getCode());
if (InnerError6 != null) return InnerError6;
}
- examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList()));
+ examPaper.setContent(JSON.toJSONString(questionTitleList));
baseMapper.insert(examPaper);
return Result.ok();
}
@@ -126,16 +136,16 @@
if (dto.getQuestionType().equals(questionType)) {
settingDTO = dto;
}
- }
- // 闇�瑕佺敓鎴愮殑棰樼洰鏁伴噺
+ }// 闇�瑕佺敓鎴愮殑棰樼洰鏁伴噺
Integer num = settingDTO.getNum();
- if(num ==0){
+ if(num ==null || num ==0 ){
//棰樼洰閰嶇疆姝ょ被鍨嬫暟閲忎负0锛岃烦杩囷紝涓嶇敓鎴愰鐩��
return null;
}
if (CollectionUtils.isEmpty(questionIdList) || num > questionIdList.size()) {
- return Result.fail(SystemCode.InnerError.getCode(), "棰樼洰鏁伴噺涓嶈冻");
+ return Result.fail(SystemCode.InnerError.getCode(), QuestionTypeEnum.fromCode(questionType).getName()+"棰樼洰鏁伴噺涓嶈冻");
}
+
// 浣跨敤Random绫荤敓鎴愪笉閲嶅鐨勯殢鏈虹储寮�
Set<Integer> indexes = new HashSet<>();
Random random = new Random();
@@ -156,7 +166,13 @@
PaperQuestion paperQuestion = new PaperQuestion();
BeanUtils.copyProperties(question,paperQuestion);
paperQuestion.setScore(settingDTO.getScore());
- paperQuestion.setItems(JSONArray.parseArray(question.getContent(), QuestionItemObject.class));
+ //杞崲
+ 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);
}
PaperFixQuestionDTO dto = new PaperFixQuestionDTO();
@@ -264,6 +280,7 @@
vo.setQuestionTitleList(JSONArray.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class));
} else {
//闅忓簭璇曞嵎
+ vo.setQuestionTitleList(JSONArray.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class));
}
return vo;
}
--
Gitblit v1.8.0