From af0cd13e3b2e2126dd0058b8c650aa675a55cd28 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期五, 01 十一月 2024 16:00:35 +0800
Subject: [PATCH] 教师修改密码
---
src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java | 114 ++++++++++++++++++++++++--------------------------------
1 files changed, 49 insertions(+), 65 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 41add6b..9df49bf 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
@@ -2,92 +2,76 @@
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
-import com.ycl.jxkg.domain.*;
-import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
-import com.ycl.jxkg.event.CalculateExamPaperAnswerCompleteEvent;
-import com.ycl.jxkg.event.UserEvent;
-import com.ycl.jxkg.service.ExamPaperAnswerService;
+import com.ycl.jxkg.domain.entity.ExamPaperScore;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperReadVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitItemVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitVO;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
+import com.ycl.jxkg.service.ExamPaperScoreService;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.SubjectService;
-import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.ExamUtil;
-import com.ycl.jxkg.utils.PageInfoHelper;
-import com.ycl.jxkg.vo.admin.exam.ExamPaperEditRequestVO;
-import com.ycl.jxkg.vo.student.exampaper.ExamPaperAnswerPageResponseVO;
-import com.ycl.jxkg.vo.student.exampaper.ExamPaperAnswerPageVO;
-import com.github.pagehelper.PageInfo;
-import com.ycl.jxkg.vo.student.exam.ExamPaperReadVO;
-import com.ycl.jxkg.vo.student.exam.ExamPaperSubmitItemVO;
-import com.ycl.jxkg.vo.student.exam.ExamPaperSubmitVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
import java.util.*;
import java.util.stream.Collectors;
-
+@RequiredArgsConstructor
@Controller("WXStudentExamPaperAnswerController")
@RequestMapping(value = "/api/wx/student/exampaper/answer")
@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;
- @Autowired
- public ExamPaperAnswerController(ExamPaperAnswerService examPaperAnswerService, SubjectService subjectService, ApplicationEventPublisher eventPublisher, ExamPaperService examPaperService) {
- this.examPaperAnswerService = examPaperAnswerService;
- this.subjectService = subjectService;
- this.eventPublisher = eventPublisher;
- this.examPaperService = examPaperService;
- }
-
- @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<ExamPaperAnswerPageResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
- ExamPaperAnswerPageResponseVO vo = new ExamPaperAnswerPageResponseVO();
- BeanUtils.copyProperties(e, vo);
- Subject subject = subjectService.selectById(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.setSubjectName(subject.getName());
- vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- return vo;
- });
- return Result.ok(page);
- }
+// @RequestMapping(value = "/pageList", method = RequestMethod.POST)
+// public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageList(@Valid ExamPaperAnswerPageVO model) {
+// model.setCreateUser(getCurrentUser().getId());
+// 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.setSubjectName(subject.getName());
+// vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
+// return vo;
+// });
+// return Result.ok(page);
+// }
@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) {
@@ -127,9 +111,9 @@
@PostMapping(value = "/read/{id}")
public Result<ExamPaperReadVO> read(@PathVariable Integer id) {
ExamPaperReadVO vm = new ExamPaperReadVO();
- ExamPaperAnswer examPaperAnswer = examPaperAnswerService.selectById(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