From 16b4725365f3286c2d2a80945e26f35f89b53f24 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 28 六月 2024 11:37:06 +0800
Subject: [PATCH] answer表改为score表，阅卷代码
---
src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
index 49b1487..0db13e4 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
@@ -3,14 +3,14 @@
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
import com.ycl.jxkg.domain.*;
-import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
+import com.ycl.jxkg.domain.entity.ExamPaperScore;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.event.CalculateExamPaperAnswerCompleteEvent;
import com.ycl.jxkg.event.UserEvent;
-import com.ycl.jxkg.service.ExamPaperAnswerService;
+import com.ycl.jxkg.service.ExamPaperScoreService;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.utils.DateTimeUtil;
@@ -40,7 +40,7 @@
@ResponseBody
public class ExamPaperAnswerController extends BaseWXApiController {
- private final ExamPaperAnswerService examPaperAnswerService;
+ private final ExamPaperScoreService examPaperScoreService;
private final SubjectService subjectService;
private final ApplicationEventPublisher eventPublisher;
private final ExamPaperService examPaperService;
@@ -48,15 +48,15 @@
@RequestMapping(value = "/pageList", method = RequestMethod.POST)
public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageList(@Valid ExamPaperAnswerPageVO model) {
model.setCreateUser(getCurrentUser().getId());
- PageInfo<ExamPaperAnswer> pageInfo = examPaperAnswerService.studentPage(model);
+ PageInfo<ExamPaperScore> pageInfo = examPaperScoreService.studentPage(model);
PageInfo<ExamPaperAnswerPageResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
ExamPaperAnswerPageResponseVO vo = new ExamPaperAnswerPageResponseVO();
BeanUtils.copyProperties(e, vo);
Subject subject = subjectService.getById(vo.getSubjectId());
vo.setDoTime(ExamUtil.secondToVM(e.getDoTime()));
- vo.setSystemScore(ExamUtil.scoreToVM(e.getSystemScore()));
- vo.setUserScore(ExamUtil.scoreToVM(e.getUserScore()));
- vo.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));
+// vo.setSystemScore(ExamUtil.scoreToVM(e.getSystemScore()));
+// vo.setUserScore(ExamUtil.scoreToVM(e.getUserScore()));
+// vo.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));
vo.setSubjectName(subject.getName());
vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
return vo;
@@ -67,23 +67,24 @@
@RequestMapping(value = "/answerSubmit", method = RequestMethod.POST)
public Result answerSubmit(HttpServletRequest request) {
- ExamPaperSubmitVO examPaperSubmitVO = requestToExamPaperSubmitVM(request);
- User user = getCurrentUser();
- ExamPaperAnswerInfo examPaperAnswerInfo = examPaperAnswerService.calculateExamPaperAnswer(examPaperSubmitVO, user);
- if (null == examPaperAnswerInfo) {
- return Result.fail(2, "璇曞嵎涓嶈兘閲嶅鍋�");
- }
- ExamPaperAnswer examPaperAnswer = examPaperAnswerInfo.getExamPaperAnswer();
- Integer userScore = examPaperAnswer.getUserScore();
- String scoreVm = ExamUtil.scoreToVM(userScore);
- UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
- String content = user.getUserName() + " 鎻愪氦璇曞嵎锛�" + examPaperAnswerInfo.getExamPaper().getName()
- + " 寰楀垎锛�" + scoreVm
- + " 鑰楁椂锛�" + ExamUtil.secondToVM(examPaperAnswer.getDoTime());
- userEventLog.setContent(content);
- eventPublisher.publishEvent(new CalculateExamPaperAnswerCompleteEvent(examPaperAnswerInfo));
- eventPublisher.publishEvent(new UserEvent(userEventLog));
- return Result.ok(scoreVm);
+//TODO:answer ExamPaperSubmitVO examPaperSubmitVO = requestToExamPaperSubmitVM(request);
+// User user = getCurrentUser();
+// ExamPaperAnswerInfo examPaperAnswerInfo = examPaperScoreService.calculateExamPaperAnswer(examPaperSubmitVO, user);
+// if (null == examPaperAnswerInfo) {
+// return Result.fail(2, "璇曞嵎涓嶈兘閲嶅鍋�");
+// }
+// ExamPaperScore examPaperScore = examPaperAnswerInfo.getExamPaperScore();
+// Integer userScore = examPaperScore.getUserScore();
+// String scoreVm = ExamUtil.scoreToVM(userScore);
+// UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
+// String content = user.getUserName() + " 鎻愪氦璇曞嵎锛�" + examPaperAnswerInfo.getExamPaper().getName()
+// + " 寰楀垎锛�" + scoreVm
+// + " 鑰楁椂锛�" + ExamUtil.secondToVM(examPaperScore.getDoTime());
+// userEventLog.setContent(content);
+// eventPublisher.publishEvent(new CalculateExamPaperAnswerCompleteEvent(examPaperAnswerInfo));
+// eventPublisher.publishEvent(new UserEvent(userEventLog));
+// return Result.ok(scoreVm);
+ return Result.ok();
}
private ExamPaperSubmitVO requestToExamPaperSubmitVM(HttpServletRequest request) {
@@ -123,9 +124,9 @@
@PostMapping(value = "/read/{id}")
public Result<ExamPaperReadVO> read(@PathVariable Integer id) {
ExamPaperReadVO vm = new ExamPaperReadVO();
- ExamPaperAnswer examPaperAnswer = examPaperAnswerService.getById(id);
- ExamPaperEditRequestVO paper = examPaperService.examPaperToVM(examPaperAnswer.getExamPaperId());
- ExamPaperSubmitVO answer = examPaperAnswerService.examPaperAnswerToVM(examPaperAnswer.getId());
+ ExamPaperScore examPaperScore = examPaperScoreService.getById(id);
+ ExamPaperEditRequestVO paper = examPaperService.examPaperToVM(examPaperScore.getPaperId());
+ ExamPaperSubmitVO answer = examPaperScoreService.examPaperAnswerToVM(examPaperScore.getId());
vm.setPaper(paper);
vm.setAnswer(answer);
return Result.ok(vm);
--
Gitblit v1.8.0