From 02d8e9c93d128ad87bd891cc45d652727862df5f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 28 六月 2024 10:27:42 +0800
Subject: [PATCH] 定时保存、主动保存接收对象调整
---
src/main/java/com/ycl/jxkg/domain/vo/StartExamVO.java | 3 +++
src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java | 5 +++--
src/main/java/com/ycl/jxkg/service/ExamService.java | 5 +++--
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 16 ++++++++--------
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java b/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java
index a3caa6f..43d7e39 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java
@@ -3,6 +3,7 @@
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.query.ExamQuery;
import com.ycl.jxkg.domain.vo.ExamSubmitVO;
+import com.ycl.jxkg.domain.vo.StartExamVO;
import com.ycl.jxkg.service.ExamService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -48,7 +49,7 @@
* @return
*/
@PostMapping("/submit")
- public Result examSubmit(@RequestBody @Validated ExamSubmitVO submitData) {
+ public Result examSubmit(@RequestBody @Validated StartExamVO submitData) {
return examService.examSubmit(submitData);
}
@@ -59,7 +60,7 @@
* @return
*/
@PostMapping("/timing")
- public Result timingExamSubmit(@RequestBody @Validated ExamSubmitVO submitData) {
+ public Result timingExamSubmit(@RequestBody @Validated StartExamVO submitData) {
return examService.timingSubmit(submitData);
}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/StartExamVO.java b/src/main/java/com/ycl/jxkg/domain/vo/StartExamVO.java
index ffc90bc..e46dd61 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/StartExamVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/StartExamVO.java
@@ -15,6 +15,9 @@
private Integer id;
+ /** 鑰冭瘯鏃堕棿 */
+ private Integer doTime;
+
/** 鑰冭瘯鍚嶇О */
private String examName;
diff --git a/src/main/java/com/ycl/jxkg/service/ExamService.java b/src/main/java/com/ycl/jxkg/service/ExamService.java
index d79fdd1..ef3882a 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamService.java
@@ -8,6 +8,7 @@
import com.ycl.jxkg.domain.form.ForceSubmitForm;
import com.ycl.jxkg.domain.query.ExamQuery;
import com.ycl.jxkg.domain.vo.ExamSubmitVO;
+import com.ycl.jxkg.domain.vo.StartExamVO;
import java.util.List;
@@ -73,7 +74,7 @@
* @param submitData
* @return
*/
- Result examSubmit(ExamSubmitVO submitData);
+ Result examSubmit(StartExamVO submitData);
/**
* 瀹氭椂淇濆瓨璇曞嵎锛岄槻姝㈣�冭瘯宕╂簝
@@ -81,7 +82,7 @@
* @param submitData
* @return
*/
- Result timingSubmit(ExamSubmitVO submitData);
+ Result timingSubmit(StartExamVO submitData);
/**
* 鑾峰彇闃呭嵎淇℃伅
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 27d2974..f5009c6 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -295,9 +295,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("璇ヨ�冭瘯涓嶅瓨鍦�");
}
@@ -340,7 +340,7 @@
* @return
*/
@Override
- public Result timingSubmit(ExamSubmitVO submitData) {
+ public Result timingSubmit(StartExamVO submitData) {
saveTempExam(submitData, ExamSubmitTempStatusEnum.TEMP);
return Result.ok();
}
@@ -351,9 +351,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)) {
@@ -361,17 +361,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);
}
--
Gitblit v1.8.0