From 4caba6f32b75523bde4bf2f988946153d5c47944 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 26 六月 2024 17:51:12 +0800 Subject: [PATCH] 开始考试返回考试信息 --- src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 100 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 87 insertions(+), 13 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..34768a8 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java @@ -3,28 +3,34 @@ import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; 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.context.WebContext; -import com.ycl.jxkg.domain.entity.*; +import com.ycl.jxkg.domain.entity.Exam; +import com.ycl.jxkg.domain.entity.ExamPaper; +import com.ycl.jxkg.domain.entity.ExamSubmitTemp; +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.domain.vo.admin.exam.ExamPaperEditRequestVO; 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.base.Result; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.jxkg.domain.form.ExamForm; -import com.ycl.jxkg.domain.query.ExamQuery; -import org.springframework.stereotype.Service; -import lombok.RequiredArgsConstructor; import com.ycl.jxkg.utils.PageUtil; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -48,6 +54,7 @@ private final ClassesUserMapper classesUserMapper; private final ExamPaperMapper examPaperMapper; private final ExamPaperService examPaperService; + private final WebsocketServer websocketServer; /** * 娣诲姞 @@ -138,6 +145,7 @@ @Override + @Transactional(rollbackFor = Exception.class) public Result start(Integer id) { Exam exam = baseMapper.selectById(id); if (Objects.isNull(exam)) { @@ -145,6 +153,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 +173,6 @@ } // 杞崲 List<PaperFixQuestionVO> data = this.coverTo(examPaper); - return Result.ok().data(data); } else if (ExamPaperTypeEnum.Random.getCode().equals(examPaper.getPaperType())) { // 鏍规嵁闅忔満璇曞嵎鐨勯厤缃紝闅忔満鐢熸垚瀵瑰簲棰樼洰 @@ -167,8 +180,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 +206,23 @@ 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); + 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(); } @@ -201,6 +234,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 +288,12 @@ return Result.ok().data(vos); } + /** + * 涓诲姩鎻愪氦璇曞嵎 + * + * @param submitData 璇曞嵎鍋氶鎻愪氦鏁版嵁 + * @return + */ @Override public Result examSubmit(ExamSubmitVO submitData) { // 鏍¢獙 @@ -291,6 +333,12 @@ return Result.ok(); } + /** + * 涓存椂淇濆瓨璇曞嵎 + * + * @param submitData + * @return + */ @Override public Result timingSubmit(ExamSubmitVO submitData) { saveTempExam(submitData, ExamSubmitTempStatusEnum.TEMP); @@ -298,7 +346,7 @@ } /** - * 淇濆瓨涓存椂璇曞嵎 + * 淇濆瓨璇曞嵎锛氬鏋滄帴鍙f槸瀹氭椂淇濆瓨閭d箞鏄复鏃惰瘯鍗枫�傚鏋滄帴鍙f槸鑷富鎻愪氦閭d箞鏄畬鎴愯瘯鍗� * * @param submitData 鍓嶇浼犻�掔殑璇曞嵎鏁版嵁 * @param status 璇曞嵎鐨勭姸鎬� @@ -389,4 +437,30 @@ } return Result.ok(vo); } + + @Override + public Result monitorList(ExamQuery query) { + IPage<ExamSubmitTempVO> page = PageUtil.getPage(query, ExamSubmitTempVO.class); + return Result.ok().data(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