From d0ebd33f5e4fdbff1f58a1af137d45b405366399 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 28 六月 2024 16:00:03 +0800
Subject: [PATCH] rabbitmq
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 10 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 33c5843..ce84882 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -12,14 +12,19 @@
import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.domain.exam.PaperFixQuestionDTO;
import com.ycl.jxkg.domain.exam.PaperQuestionSettingDTO;
+import com.ycl.jxkg.domain.form.AddTimeForm;
import com.ycl.jxkg.domain.form.ExamForm;
+import com.ycl.jxkg.domain.form.ForceSubmitForm;
import com.ycl.jxkg.domain.query.ExamQuery;
import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.domain.vo.*;
import com.ycl.jxkg.enums.ExamPaperTypeEnum;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.WebsocketCommendEnum;
import com.ycl.jxkg.enums.general.ExamStatusEnum;
import com.ycl.jxkg.enums.general.ExamSubmitTempStatusEnum;
import com.ycl.jxkg.mapper.*;
+import com.ycl.jxkg.server.WebsocketServer;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.ExamService;
import com.ycl.jxkg.utils.PageUtil;
@@ -50,6 +55,7 @@
private final ClassesUserMapper classesUserMapper;
private final ExamPaperMapper examPaperMapper;
private final ExamPaperService examPaperService;
+ private final WebsocketServer websocketServer;
/**
* 娣诲姞
@@ -160,6 +166,20 @@
if (Objects.isNull(examPaper)) {
throw new RuntimeException("璇曞嵎涓嶅瓨鍦�");
}
+ // 濡傛灉宸茬粡鍙傚姞杩囪�冭瘯锛岀洿鎺ヨ繑鍥炴暟鎹�
+ ExamSubmitTemp hasJoin = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
+ .eq(ExamSubmitTemp::getExamId, id)
+ .eq(ExamSubmitTemp::getUserId, webContext.getCurrentUser().getId())
+ .one();
+ if (Objects.nonNull(hasJoin)) {
+ StartExamVO startExamVO = new StartExamVO();
+ startExamVO.setExamName(exam.getExamName());
+ startExamVO.setId(hasJoin.getExamId());
+ startExamVO.setTitleList(JSON.parseArray(hasJoin.getExamSubmit(), PaperFixQuestionVO.class));
+ startExamVO.setSuggestTime(examPaper.getSuggestTime());
+ startExamVO.setDoTime(hasJoin.getDoTime());
+ return Result.ok(startExamVO);
+ }
// 灏嗛鐩浆鎹负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯銆傚浐瀹氳瘯鍗峰拰闅忓簭璇曞嵎鐨勯鐩槸鐩存帴淇濆瓨鍒癱ontent瀛楁鐨�
if (ExamPaperTypeEnum.Fixed.getCode().equals(examPaper.getPaperType())
|| ExamPaperTypeEnum.RandomOrder.getCode().equals(examPaper.getPaperType())) {
@@ -212,7 +232,12 @@
examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.TEMP);
examSubmitTempMapper.insert(examSubmitTemp);
- return Result.ok(examData);
+ StartExamVO startExamVO = new StartExamVO();
+ startExamVO.setExamName(exam.getExamName());
+ startExamVO.setId(exam.getId());
+ startExamVO.setTitleList(examData);
+ startExamVO.setSuggestTime(examPaper.getSuggestTime());
+ return Result.ok(startExamVO);
}
return Result.ok();
}
@@ -236,6 +261,12 @@
DoQuestionVO doQuestionVO = new DoQuestionVO();
doQuestionVO.setTitle(question.getTitle());
doQuestionVO.setQuestionType(item.getQuestionType());
+ // 濉┖棰橀渶瑕佹姽闄ontent(鍥犱负鏄瓟妗�)
+ if (QuestionTypeEnum.GapFilling.getCode().equals(doQuestionVO.getQuestionType())) {
+ question.getItems().stream().forEach(option -> {
+ option.setContent("");
+ });
+ }
doQuestionVO.setQuestionItemList(question.getItems());
doQuestionVO.setId(question.getId());
doQuestionVO.setOriginalFile(question.getOriginalFile());
@@ -285,9 +316,9 @@
* @return
*/
@Override
- public Result examSubmit(ExamSubmitVO submitData) {
+ public Result examSubmit(StartExamVO submitData) {
// 鏍￠獙
- Exam exam = examMapper.selectById(submitData.getExamId());
+ Exam exam = examMapper.selectById(submitData.getId());
if (Objects.isNull(exam)) {
throw new RuntimeException("璇ヨ�冭瘯涓嶅瓨鍦�");
}
@@ -330,7 +361,7 @@
* @return
*/
@Override
- public Result timingSubmit(ExamSubmitVO submitData) {
+ public Result timingSubmit(StartExamVO submitData) {
saveTempExam(submitData, ExamSubmitTempStatusEnum.TEMP);
return Result.ok();
}
@@ -341,9 +372,9 @@
* @param submitData 鍓嶇浼犻�掔殑璇曞嵎鏁版嵁
* @param status 璇曞嵎鐨勭姸鎬�
*/
- public void saveTempExam(ExamSubmitVO submitData, ExamSubmitTempStatusEnum status) {
+ public void saveTempExam(StartExamVO submitData, ExamSubmitTempStatusEnum status) {
ExamSubmitTemp one = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
- .eq(ExamSubmitTemp::getExamId, submitData.getExamId())
+ .eq(ExamSubmitTemp::getExamId, submitData.getId())
.eq(ExamSubmitTemp::getUserId, webContext.getCurrentUser().getId())
.one();
if (Objects.nonNull(one)) {
@@ -351,17 +382,17 @@
return;
}
one.setDoTime(submitData.getDoTime());
- one.setExamSubmit(JSON.toJSONString(submitData.getPaperQuestionList()));
+ one.setExamSubmit(JSON.toJSONString(submitData.getTitleList()));
one.setCreateTime(new Date());
one.setStatus(status);
examSubmitTempMapper.updateById(one);
} else {
ExamSubmitTemp examSubmitTemp = new ExamSubmitTemp();
- examSubmitTemp.setExamId(submitData.getExamId());
+ examSubmitTemp.setExamId(submitData.getId());
examSubmitTemp.setDoTime(submitData.getDoTime());
examSubmitTemp.setStatus(status);
examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
- examSubmitTemp.setExamSubmit(JSON.toJSONString(submitData.getPaperQuestionList()));
+ examSubmitTemp.setExamSubmit(JSON.toJSONString(submitData.getTitleList()));
examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.TEMP);
examSubmitTempMapper.insert(examSubmitTemp);
}
@@ -431,6 +462,26 @@
@Override
public Result monitorList(ExamQuery query) {
IPage<ExamSubmitTempVO> page = PageUtil.getPage(query, ExamSubmitTempVO.class);
- return Result.ok().data(examSubmitTempMapper.monitorList(page, query));
+ return Result.ok((examSubmitTempMapper.monitorList(page, query)));
+ }
+
+ @Override
+ public Result addTime(AddTimeForm form) {
+ WebsocketDataVO websocket = new WebsocketDataVO();
+ websocket.setCommend(WebsocketCommendEnum.DELAYED.getCommend());
+ websocket.setData(form);
+ // 鍙戦�亀ebsocket娑堟伅
+ websocketServer.sendOneMessage(form.getUserId(), JSON.toJSONString(form));
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ public Result forceSubmit(ForceSubmitForm form) {
+ WebsocketDataVO websocket = new WebsocketDataVO();
+ websocket.setCommend(WebsocketCommendEnum.FORCE_SUBMIT.getCommend());
+ websocket.setData(form);
+ // 鍙戦�亀ebsocket娑堟伅
+ websocketServer.sendOneMessage(form.getUserId(), JSON.toJSONString(form));
+ return Result.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0