From c5b38a50819d7ac782a4379bd9eda890d7d119a8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 六月 2024 15:47:51 +0800
Subject: [PATCH] 班级、试卷、开始考试优化
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 674129f..f677a78 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -25,6 +25,7 @@
import lombok.RequiredArgsConstructor;
import com.ycl.jxkg.utils.PageUtil;
import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -138,6 +139,7 @@
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result start(Integer id) {
Exam exam = baseMapper.selectById(id);
if (Objects.isNull(exam)) {
@@ -145,6 +147,12 @@
}
if (Objects.isNull(exam.getExamPaperId())) {
throw new RuntimeException("鑰冭瘯鏈粦瀹氳瘯鍗�");
+ }
+ if (ExamStatusEnum.NOT_START.equals(exam.getStatus())) {
+ throw new RuntimeException("鑰冭瘯杩樻湭寮�濮�");
+ }
+ if (ExamStatusEnum.FINISHED.equals(exam.getStatus())) {
+ throw new RuntimeException("鑰冭瘯宸茬粡缁撴潫");
}
// 鏌ュ嚭鑰冭瘯璇曞嵎
ExamPaper examPaper = examPaperMapper.selectById(exam.getExamPaperId());
@@ -159,7 +167,6 @@
}
// 杞崲
List<PaperFixQuestionVO> data = this.coverTo(examPaper);
-
return Result.ok().data(data);
} else if (ExamPaperTypeEnum.Random.getCode().equals(examPaper.getPaperType())) {
// 鏍规嵁闅忔満璇曞嵎鐨勯厤缃紝闅忔満鐢熸垚瀵瑰簲棰樼洰
@@ -167,8 +174,13 @@
throw new RuntimeException("璇曞嵎閰嶇疆寮傚父锛岃鑱旂郴鑰佸笀");
}
List<PaperQuestionSettingDTO> paperSettingList = JSON.parseArray(examPaper.getContent(), PaperQuestionSettingDTO.class);
- List<DoQuestionVO> questionList = new ArrayList<>(24);
+
+ // 璇曞嵎鍐呭
+ List<PaperFixQuestionVO> examData = new ArrayList<>(8);
for (PaperQuestionSettingDTO paperSetting : paperSettingList) {
+ PaperFixQuestionVO paperFixQuestionVO = new PaperFixQuestionVO();
+ paperFixQuestionVO.setTitle(paperSetting.getTitle());
+ paperFixQuestionVO.setQuestionType(paperSetting.getQuestionType());
// 鎷垮埌璇剧洰涓嬫煇绫婚鍨嬬殑x閬撻殢鏈洪
List<Question> questions = questionMapper.getRandomQuestion(examPaper.getSubjectId(), paperSetting.getQuestionType(), paperSetting.getNum());
if (paperSetting.getNum() > questions.size()) {
@@ -188,8 +200,18 @@
doQuestionVO.setAudioFile(item.getAudioFile());
return doQuestionVO;
}).collect(Collectors.toList());
- questionList.addAll(childQuestions);
+ paperFixQuestionVO.setQuestionList(childQuestions);
+ examData.add(paperFixQuestionVO);
}
+ ExamSubmitTemp examSubmitTemp = new ExamSubmitTemp();
+ examSubmitTemp.setExamId(id);
+ examSubmitTemp.setStatus(ExamSubmitTempStatusEnum.TEMP);
+ examSubmitTemp.setExamSubmit(JSON.toJSONString(examData));
+ examSubmitTemp.setCreateTime(new Date());
+ examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
+ examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.TEMP);
+ examSubmitTempMapper.insert(examSubmitTemp);
+ return Result.ok(examData);
}
return Result.ok();
}
@@ -201,6 +223,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();
@@ -252,6 +277,12 @@
return Result.ok().data(vos);
}
+ /**
+ * 涓诲姩鎻愪氦璇曞嵎
+ *
+ * @param submitData 璇曞嵎鍋氶鎻愪氦鏁版嵁
+ * @return
+ */
@Override
public Result examSubmit(ExamSubmitVO submitData) {
// 鏍￠獙
@@ -291,6 +322,12 @@
return Result.ok();
}
+ /**
+ * 涓存椂淇濆瓨璇曞嵎
+ *
+ * @param submitData
+ * @return
+ */
@Override
public Result timingSubmit(ExamSubmitVO submitData) {
saveTempExam(submitData, ExamSubmitTempStatusEnum.TEMP);
@@ -298,7 +335,7 @@
}
/**
- * 淇濆瓨涓存椂璇曞嵎
+ * 淇濆瓨璇曞嵎锛氬鏋滄帴鍙ｆ槸瀹氭椂淇濆瓨閭ｄ箞鏄复鏃惰瘯鍗枫�傚鏋滄帴鍙ｆ槸鑷富鎻愪氦閭ｄ箞鏄畬鎴愯瘯鍗�
*
* @param submitData 鍓嶇浼犻�掔殑璇曞嵎鏁版嵁
* @param status 璇曞嵎鐨勭姸鎬�
--
Gitblit v1.8.0