From 0fb6563de530e5278356f7557480764cb59942c5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 25 六月 2024 15:14:42 +0800
Subject: [PATCH] 会议后台+学生端对接
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index e2473ff..3efb975 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -6,6 +6,8 @@
import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.*;
import com.ycl.jxkg.domain.exam.PaperFixQuestionDTO;
+import com.ycl.jxkg.domain.exam.PaperQuestionSettingDTO;
+import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.domain.vo.*;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
import com.ycl.jxkg.enums.ExamPaperTypeEnum;
@@ -149,20 +151,56 @@
if (Objects.isNull(examPaper)) {
throw new RuntimeException("璇曞嵎涓嶅瓨鍦�");
}
- if (StringUtils.hasText(examPaper.getContent())) {
- throw new RuntimeException("璇曞嵎棰樼洰涓虹┖");
- }
- // 灏嗛鐩浆鎹负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯
+ // 灏嗛鐩浆鎹负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯銆傚浐瀹氳瘯鍗峰拰闅忓簭璇曞嵎鐨勯鐩槸鐩存帴淇濆瓨鍒癱ontent瀛楁鐨�
if (ExamPaperTypeEnum.Fixed.getCode().equals(examPaper.getPaperType())
|| ExamPaperTypeEnum.RandomOrder.getCode().equals(examPaper.getPaperType())) {
+ if (StringUtils.hasText(examPaper.getContent())) {
+ throw new RuntimeException("璇曞嵎棰樼洰涓虹┖");
+ }
// 杞崲
List<PaperFixQuestionVO> data = this.coverTo(examPaper);
+
return Result.ok().data(data);
} else if (ExamPaperTypeEnum.Random.getCode().equals(examPaper.getPaperType())) {
- // todo 闅忔満棰樼洰鐢熸垚
+ // 鏍规嵁闅忔満璇曞嵎鐨勯厤缃紝闅忔満鐢熸垚瀵瑰簲棰樼洰
+ if (! StringUtils.hasText(examPaper.getContent())) {
+ throw new RuntimeException("璇曞嵎閰嶇疆寮傚父锛岃鑱旂郴鑰佸笀");
+ }
+ List<PaperQuestionSettingDTO> paperSettingList = JSON.parseArray(examPaper.getContent(), PaperQuestionSettingDTO.class);
+ List<DoQuestionVO> questionList = new ArrayList<>(24);
+ for (PaperQuestionSettingDTO paperSetting : paperSettingList) {
+ // 鎷垮埌璇剧洰涓嬫煇绫婚鍨嬬殑x閬撻殢鏈洪
+ List<Question> questions = questionMapper.getRandomQuestion(examPaper.getSubjectId(), paperSetting.getQuestionType(), paperSetting.getNum());
+ if (paperSetting.getNum() > questions.size()) {
+ throw new RuntimeException("閰嶇疆鐨勯鐩暟涓嶈冻浠ョ敓鎴愯瘯鍗�");
+ }
+ // 鎷垮埌棰樼洰鍚庣粍瑁呬负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯
+ List<DoQuestionVO> childQuestions = questions.stream().map(item -> {
+ DoQuestionVO doQuestionVO = new DoQuestionVO();
+ doQuestionVO.setTitle(item.getTitle());
+ doQuestionVO.setQuestionType(item.getQuestionType());
+ if (StringUtils.hasText(item.getContent())) {
+ QuestionObject questionObject = JSON.parseObject(item.getContent(), QuestionObject.class);
+ doQuestionVO.setQuestionItemList(questionObject.getQuestionItemObjects());
+ }
+ doQuestionVO.setId(item.getId());
+ doQuestionVO.setOriginalFile(item.getOriginalFile());
+ doQuestionVO.setAudioFile(item.getAudioFile());
+ return doQuestionVO;
+ }).collect(Collectors.toList());
+ questionList.addAll(childQuestions);
+ }
+ // 淇濇寔闅忔満璇曞嵎鍜屽浐瀹氳瘯鍗风殑鏍煎紡涓�鑷�
+ List<PaperFixQuestionVO> examData = new ArrayList<>(1);
+ PaperFixQuestionVO paperFixQuestionVO = new PaperFixQuestionVO();
+ paperFixQuestionVO.setQuestionList(questionList);
+ paperFixQuestionVO.setTitle("");
+ paperFixQuestionVO.setQuestionType(null);
+ examData.add(paperFixQuestionVO);
+ return Result.ok(examData);
}
- return null;
+ return Result.ok();
}
/**
@@ -172,6 +210,9 @@
* @return
*/
private List<PaperFixQuestionVO> coverTo(ExamPaper examPaper) {
+ if (! StringUtils.hasText(examPaper.getContent())) {
+ throw new RuntimeException("璇曞嵎鏈厤缃鐩紝璇疯仈绯昏�佸笀");
+ }
List<PaperFixQuestionDTO> questionWarpList = JSON.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class);
return questionWarpList.stream().map(item -> {
PaperFixQuestionVO vo = new PaperFixQuestionVO();
@@ -301,7 +342,7 @@
}
@Override
- public Result getMarkPaperInfo(Integer id) {
+ public Result getMarkResultInfo(Integer id) {
Exam exam = baseMapper.selectById(id);
if (Objects.isNull(exam)) {
throw new RuntimeException("璇ヨ�冭瘯涓嶅瓨鍦�");
@@ -341,4 +382,23 @@
return Result.ok().data(markPaperVO);
}
+
+ @Override
+ public Result getMarkPaperInfo(Integer examId, Integer userId) {
+ ExamSubmitTemp userExam = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
+ .eq(ExamSubmitTemp::getExamId, examId)
+ .eq(ExamSubmitTemp::getUserId, userId)
+ .one();
+ if (Objects.isNull(userExam)) {
+ throw new RuntimeException("璇ュ鍛樿�冭瘯璁板綍涓嶅瓨鍦�");
+ }
+ ExamSubmitVO vo = new ExamSubmitVO();
+ vo.setExamId(userExam.getExamId());
+ vo.setDoTime(userExam.getDoTime());
+ vo.setUpdateTime(userExam.getUpdateTime());
+ if (StringUtils.hasText(userExam.getExamSubmit())) {
+ vo.setPaperQuestionList(JSON.parseArray(userExam.getExamSubmit(), PaperFixQuestionVO.class));
+ }
+ return Result.ok(vo);
+ }
}
--
Gitblit v1.8.0