From 8546b3d285af4235a0ef615a0c6e89486ae2c806 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 17 十月 2024 21:01:37 +0800
Subject: [PATCH] 达梦不支持value改为values
---
src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java | 152 +++++++++++++++++++++++---------------------------
1 files changed, 69 insertions(+), 83 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 483aca6..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
@@ -1,135 +1,121 @@
package com.ycl.jxkg.controller.wx.student;
-import com.ycl.jxkg.base.RestResponse;
+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.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.exampaper.ExamPaperAnswerPageResponseVM;
-import com.ycl.jxkg.viewmodel.student.exampaper.ExamPaperAnswerPageVM;
-import com.github.pagehelper.PageInfo;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperReadVM;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperSubmitItemVM;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperSubmitVM;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ycl.jxkg.utils.ExamUtil;
+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 RestResponse<PageInfo<ExamPaperAnswerPageResponseVM>> pageList(@Valid ExamPaperAnswerPageVM 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;
- });
- return RestResponse.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 RestResponse answerSubmit(HttpServletRequest request) {
- ExamPaperSubmitVM examPaperSubmitVM = requestToExamPaperSubmitVM(request);
- User user = getCurrentUser();
- ExamPaperAnswerInfo examPaperAnswerInfo = examPaperAnswerService.calculateExamPaperAnswer(examPaperSubmitVM, user);
- if (null == examPaperAnswerInfo) {
- return RestResponse.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 RestResponse.ok(scoreVm);
+ public Result answerSubmit(HttpServletRequest request) {
+//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 ExamPaperSubmitVM requestToExamPaperSubmitVM(HttpServletRequest request) {
- ExamPaperSubmitVM examPaperSubmitVM = new ExamPaperSubmitVM();
- examPaperSubmitVM.setId(Integer.parseInt(request.getParameter("id")));
- examPaperSubmitVM.setDoTime(Integer.parseInt(request.getParameter("doTime")));
+ private ExamPaperSubmitVO requestToExamPaperSubmitVM(HttpServletRequest request) {
+ ExamPaperSubmitVO examPaperSubmitVO = new ExamPaperSubmitVO();
+ examPaperSubmitVO.setId(Integer.parseInt(request.getParameter("id")));
+ examPaperSubmitVO.setDoTime(Integer.parseInt(request.getParameter("doTime")));
List<String> parameterNames = Collections.list(request.getParameterNames()).stream()
.filter(n -> n.contains("_"))
.collect(Collectors.toList());
//棰樼洰绛旀鎸夊簭鍙峰垎缁�
Map<String, List<String>> questionGroup = parameterNames.stream().collect(Collectors.groupingBy(p -> p.substring(0, p.indexOf("_"))));
- List<ExamPaperSubmitItemVM> answerItems = new ArrayList<>();
+ List<ExamPaperSubmitItemVO> answerItems = new ArrayList<>();
questionGroup.forEach((k, v) -> {
- ExamPaperSubmitItemVM examPaperSubmitItemVM = new ExamPaperSubmitItemVM();
+ ExamPaperSubmitItemVO examPaperSubmitItemVO = new ExamPaperSubmitItemVO();
String p = v.get(0);
String[] keys = p.split("_");
- examPaperSubmitItemVM.setQuestionId(Integer.parseInt(keys[1]));
- examPaperSubmitItemVM.setItemOrder(Integer.parseInt(keys[0]));
+ examPaperSubmitItemVO.setQuestionId(Integer.parseInt(keys[1]));
+ examPaperSubmitItemVO.setItemOrder(Integer.parseInt(keys[0]));
QuestionTypeEnum typeEnum = QuestionTypeEnum.fromCode(Integer.parseInt(keys[2]));
if (v.size() == 1) {
String content = request.getParameter(p);
- examPaperSubmitItemVM.setContent(content);
+ examPaperSubmitItemVO.setContent(content);
if (typeEnum == QuestionTypeEnum.MultipleChoice) {
- examPaperSubmitItemVM.setContentArray(Arrays.asList(content.split(",")));
+ examPaperSubmitItemVO.setContentArray(Arrays.asList(content.split(",")));
}
} else { //澶氫釜绌� 濉┖棰�
List<String> answers = v.stream().sorted(Comparator.comparingInt(ExamUtil::lastNum)).map(inputKey -> request.getParameter(inputKey)).collect(Collectors.toList());
- examPaperSubmitItemVM.setContentArray(answers);
+ examPaperSubmitItemVO.setContentArray(answers);
}
- answerItems.add(examPaperSubmitItemVM);
+ answerItems.add(examPaperSubmitItemVO);
});
- examPaperSubmitVM.setAnswerItems(answerItems);
- return examPaperSubmitVM;
+ examPaperSubmitVO.setAnswerItems(answerItems);
+ return examPaperSubmitVO;
}
@PostMapping(value = "/read/{id}")
- public RestResponse<ExamPaperReadVM> read(@PathVariable Integer id) {
- ExamPaperReadVM vm = new ExamPaperReadVM();
- ExamPaperAnswer examPaperAnswer = examPaperAnswerService.selectById(id);
- ExamPaperEditRequestVM paper = examPaperService.examPaperToVM(examPaperAnswer.getExamPaperId());
- ExamPaperSubmitVM answer = examPaperAnswerService.examPaperAnswerToVM(examPaperAnswer.getId());
+ public Result<ExamPaperReadVO> read(@PathVariable Integer id) {
+ ExamPaperReadVO vm = new ExamPaperReadVO();
+ ExamPaperScore examPaperScore = examPaperScoreService.getById(id);
+ ExamPaperEditRequestVO paper = examPaperService.examPaperToVM(examPaperScore.getPaperId());
+ ExamPaperSubmitVO answer = examPaperScoreService.examPaperAnswerToVM(examPaperScore.getId());
vm.setPaper(paper);
vm.setAnswer(answer);
- return RestResponse.ok(vm);
+ return Result.ok(vm);
}
}
--
Gitblit v1.8.0