From 9797dca8f3a12c0e72942b8043c1b225bde2bbaf Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 16:26:02 +0800
Subject: [PATCH] feat：题目导入
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 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 d45c7e3..98b9c3a 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -249,6 +249,10 @@
.eq(ExamSubmitTemp::getUserId, webContext.getCurrentUser().getId())
.one();
if (Objects.nonNull(hasJoin)) {
+ //TODO锛氬紑鍙戠幆澧冨厛鍏抽棴
+// if(ExamSubmitTempStatusEnum.finish.equals(hasJoin.getStatus())){
+// throw new RuntimeException("鎮ㄥ凡鎻愪氦璇曞嵎锛岃鍕块噸澶嶄綔绛�");
+// }
StartExamVO startExamVO = new StartExamVO();
startExamVO.setExamName(exam.getExamName());
startExamVO.setId(hasJoin.getExamId());
@@ -373,6 +377,24 @@
doQuestionVO.setQuestionType(item.getQuestionType());
//澧炲姞棰樼洰鍒嗘暟
doQuestionVO.setQuestionScore(question.getScore());
+
+ // 棰樼洰鍓湰
+ QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO();
+ copy.setId(question.getId());
+ copy.setAnalyze(question.getAnalyze());
+ copy.setDifficult(question.getDifficult());
+ //濉┖鐨勭瓟妗堝湪Json閲�
+ if (QuestionTypeEnum.GapFilling.getCode().equals(item.getQuestionType())) {
+ List<String> gapAnswer = new ArrayList<>();
+ for (QuestionItemObject questionItemObject : question.getItems()) {
+ gapAnswer.add(questionItemObject.getContent());
+ }
+ copy.setCorrect(String.join(ANSWER_SPLIT, gapAnswer));
+ } else {
+ copy.setCorrect(question.getCorrect());
+ }
+ questionAnswerCopyVOList.add(copy);
+
// 濉┖棰橀渶瑕佹姽闄ontent(鍥犱负鏄瓟妗�)
if (QuestionTypeEnum.GapFilling.getCode().equals(doQuestionVO.getQuestionType())) {
question.getItems().stream().forEach(option -> {
@@ -383,24 +405,6 @@
doQuestionVO.setId(question.getId());
doQuestionVO.setOriginalFile(question.getOriginalFile());
doQuestionVO.setAudioFile(question.getAudioFile());
-
- // 棰樼洰鍓湰
- QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO();
- copy.setId(question.getId());
- copy.setAnalyze(question.getAnalyze());
- copy.setDifficult(question.getDifficult());
- //濉┖鐨勭瓟妗堝湪Json閲�
- if (QuestionTypeEnum.GapFilling.getCode().equals(item.getQuestionType())) {
- List<String> gapAnswer = new ArrayList<>();
- for (QuestionItemObject questionItemObject : doQuestionVO.getQuestionItemList()) {
- gapAnswer.add(questionItemObject.getContent());
- }
- copy.setCorrect(String.join(ANSWER_SPLIT, gapAnswer));
- } else {
- copy.setCorrect(question.getCorrect());
- }
- questionAnswerCopyVOList.add(copy);
-
return doQuestionVO;
}).collect(Collectors.toList());
if (ExamPaperTypeEnum.RandomOrder.getCode().equals(examPaper.getPaperType())) {
@@ -885,7 +889,7 @@
throw new RuntimeException("璇ュ鍛樹笉鍦ㄧ嚎锛屾棤娉曟墽琛岃鎿嶄綔");
}
WebsocketDataVO websocket = new WebsocketDataVO();
- websocket.setCommend(WebsocketCommendEnum.DELAYED.getCommend());
+ websocket.setCommend(WebsocketCommendEnum.DELAYED.getCommand());
BigDecimal sed = BigDecimal.valueOf(60).multiply(form.getAddTimeM());
form.setAddTimeM(sed);
websocket.setData(form);
@@ -900,7 +904,7 @@
throw new RuntimeException("璇ュ鍛樹笉鍦ㄧ嚎锛屾棤娉曟墽琛岃鎿嶄綔");
}
WebsocketDataVO websocket = new WebsocketDataVO();
- websocket.setCommend(WebsocketCommendEnum.FORCE_SUBMIT.getCommend());
+ websocket.setCommend(WebsocketCommendEnum.FORCE_SUBMIT.getCommand());
websocket.setData(form);
// 鍙戦�亀ebsocket娑堟伅
websocketServer.sendOneMessage(form.getUserId(), JSON.toJSONString(form));
--
Gitblit v1.8.0