From c46f49af9e766aed0ba583fce0efab98ebcdf76c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 18 六月 2024 17:12:06 +0800
Subject: [PATCH] 管理员增加学生端权限
---
src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java | 98 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java
index cef0325..f9e0cae 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java
@@ -1,30 +1,38 @@
package com.ycl.jxkg.controller.student;
import com.ycl.jxkg.base.BaseApiController;
-import com.ycl.jxkg.base.RestResponse;
+import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.*;
-import com.ycl.jxkg.domain.enums.ExamPaperAnswerStatusEnum;
+import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
+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.domain.vo.ExamSubmitVO;
+import com.ycl.jxkg.enums.ExamPaperAnswerStatusEnum;
import com.ycl.jxkg.event.CalculateExamPaperAnswerCompleteEvent;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.service.ExamPaperAnswerService;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.SubjectService;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.ExamUtil;
-import com.ycl.jxkg.utility.PageInfoHelper;
-import com.ycl.jxkg.viewmodel.admin.exam.ExamPaperEditRequestVM;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperReadVM;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperSubmitVM;
-import com.ycl.jxkg.viewmodel.student.exampaper.ExamPaperAnswerPageResponseVM;
-import com.ycl.jxkg.viewmodel.student.exampaper.ExamPaperAnswerPageVM;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.ExamUtil;
+import com.ycl.jxkg.utils.PageInfoHelper;
+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.ExamPaperSubmitVO;
+import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO;
+import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageVO;
import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.Date;
+@RequiredArgsConstructor
@RestController("StudentExamPaperAnswerController")
@RequestMapping(value = "/api/student/exampaper/answer")
public class ExamPaperAnswerController extends BaseApiController {
@@ -34,40 +42,33 @@
private final SubjectService subjectService;
private final ApplicationEventPublisher eventPublisher;
- @Autowired
- public ExamPaperAnswerController(ExamPaperAnswerService examPaperAnswerService, ExamPaperService examPaperService, SubjectService subjectService, ApplicationEventPublisher eventPublisher) {
- this.examPaperAnswerService = examPaperAnswerService;
- this.examPaperService = examPaperService;
- this.subjectService = subjectService;
- this.eventPublisher = eventPublisher;
- }
-
@RequestMapping(value = "/pageList", method = RequestMethod.POST)
- public RestResponse<PageInfo<ExamPaperAnswerPageResponseVM>> pageList(@RequestBody @Valid ExamPaperAnswerPageVM model) {
+ public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageList(@RequestBody @Valid ExamPaperAnswerPageVO model) {
model.setCreateUser(getCurrentUser().getId());
PageInfo<ExamPaperAnswer> pageInfo = examPaperAnswerService.studentPage(model);
- PageInfo<ExamPaperAnswerPageResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
- ExamPaperAnswerPageResponseVM vm = modelMapper.map(e, ExamPaperAnswerPageResponseVM.class);
- Subject subject = subjectService.selectById(vm.getSubjectId());
- vm.setDoTime(ExamUtil.secondToVM(e.getDoTime()));
- vm.setSystemScore(ExamUtil.scoreToVM(e.getSystemScore()));
- vm.setUserScore(ExamUtil.scoreToVM(e.getUserScore()));
- vm.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));
- vm.setSubjectName(subject.getName());
- vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- return vm;
+ 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 RestResponse.ok(page);
+ return Result.ok(page);
}
@RequestMapping(value = "/answerSubmit", method = RequestMethod.POST)
- public RestResponse answerSubmit(@RequestBody @Valid ExamPaperSubmitVM examPaperSubmitVM) {
+ public Result answerSubmit(@RequestBody @Valid ExamPaperSubmitVO examPaperSubmitVO) {
User user = getCurrentUser();
- ExamPaperAnswerInfo examPaperAnswerInfo = examPaperAnswerService.calculateExamPaperAnswer(examPaperSubmitVM, user);
+ ExamPaperAnswerInfo examPaperAnswerInfo = examPaperAnswerService.calculateExamPaperAnswer(examPaperSubmitVO, user);
if (null == examPaperAnswerInfo) {
- return RestResponse.fail(2, "璇曞嵎涓嶈兘閲嶅鍋�");
+ return Result.fail(2, "璇曞嵎涓嶈兘閲嶅鍋�");
}
ExamPaperAnswer examPaperAnswer = examPaperAnswerInfo.getExamPaperAnswer();
Integer userScore = examPaperAnswer.getUserScore();
@@ -79,40 +80,39 @@
userEventLog.setContent(content);
eventPublisher.publishEvent(new CalculateExamPaperAnswerCompleteEvent(examPaperAnswerInfo));
eventPublisher.publishEvent(new UserEvent(userEventLog));
- return RestResponse.ok(scoreVm);
+ return Result.ok(scoreVm);
}
-
@RequestMapping(value = "/edit", method = RequestMethod.POST)
- public RestResponse edit(@RequestBody @Valid ExamPaperSubmitVM examPaperSubmitVM) {
- boolean notJudge = examPaperSubmitVM.getAnswerItems().stream().anyMatch(i -> i.getDoRight() == null && i.getScore() == null);
+ public Result edit(@RequestBody @Valid ExamPaperSubmitVO examPaperSubmitVO) {
+ boolean notJudge = examPaperSubmitVO.getAnswerItems().stream().anyMatch(i -> i.getDoRight() == null && i.getScore() == null);
if (notJudge) {
- return RestResponse.fail(2, "鏈夋湭鎵规敼棰樼洰");
+ return Result.fail(2, "鏈夋湭鎵规敼棰樼洰");
}
- ExamPaperAnswer examPaperAnswer = examPaperAnswerService.selectById(examPaperSubmitVM.getId());
+ ExamPaperAnswer examPaperAnswer = examPaperAnswerService.getById(examPaperSubmitVO.getId());
ExamPaperAnswerStatusEnum examPaperAnswerStatusEnum = ExamPaperAnswerStatusEnum.fromCode(examPaperAnswer.getStatus());
if (examPaperAnswerStatusEnum == ExamPaperAnswerStatusEnum.Complete) {
- return RestResponse.fail(3, "璇曞嵎宸插畬鎴�");
+ return Result.fail(3, "璇曞嵎宸插畬鎴�");
}
- String score = examPaperAnswerService.judge(examPaperSubmitVM);
+ String score = examPaperAnswerService.judge(examPaperSubmitVO);
User user = getCurrentUser();
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
String content = user.getUserName() + " 鎵规敼璇曞嵎锛�" + examPaperAnswer.getPaperName() + " 寰楀垎锛�" + score;
userEventLog.setContent(content);
eventPublisher.publishEvent(new UserEvent(userEventLog));
- return RestResponse.ok(score);
+ return Result.ok(score);
}
@RequestMapping(value = "/read/{id}", method = RequestMethod.POST)
- public RestResponse<ExamPaperReadVM> read(@PathVariable Integer id) {
- ExamPaperAnswer examPaperAnswer = examPaperAnswerService.selectById(id);
- ExamPaperReadVM vm = new ExamPaperReadVM();
- ExamPaperEditRequestVM paper = examPaperService.examPaperToVM(examPaperAnswer.getExamPaperId());
- ExamPaperSubmitVM answer = examPaperAnswerService.examPaperAnswerToVM(examPaperAnswer.getId());
+ public Result<ExamPaperReadVO> read(@PathVariable Integer id) {
+ ExamPaperAnswer examPaperAnswer = examPaperAnswerService.getById(id);
+ ExamPaperReadVO vm = new ExamPaperReadVO();
+ ExamPaperEditRequestVO paper = examPaperService.examPaperToVM(examPaperAnswer.getExamPaperId());
+ ExamPaperSubmitVO answer = examPaperAnswerService.examPaperAnswerToVM(examPaperAnswer.getId());
vm.setPaper(paper);
vm.setAnswer(answer);
- return RestResponse.ok(vm);
+ return Result.ok(vm);
}
--
Gitblit v1.8.0