From 16d10cef208de048f8b325facd143c54b7be9963 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 31 五月 2024 11:53:39 +0800
Subject: [PATCH] 重构：lombok、vo、mybatisplus、beanutils、包名
---
src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java b/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java
index 210d56c..755d6c1 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java
@@ -1,7 +1,7 @@
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.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.TextContent;
@@ -10,16 +10,17 @@
import com.ycl.jxkg.service.QuestionService;
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.service.TextContentService;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.HtmlUtil;
-import com.ycl.jxkg.utility.JsonUtil;
-import com.ycl.jxkg.utility.PageInfoHelper;
-import com.ycl.jxkg.viewmodel.admin.question.QuestionEditRequestVM;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperSubmitItemVM;
-import com.ycl.jxkg.viewmodel.student.question.answer.QuestionAnswerVM;
-import com.ycl.jxkg.viewmodel.student.question.answer.QuestionPageStudentRequestVM;
-import com.ycl.jxkg.viewmodel.student.question.answer.QuestionPageStudentResponseVM;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.HtmlUtil;
+import com.ycl.jxkg.utils.JsonUtil;
+import com.ycl.jxkg.utils.PageInfoHelper;
+import com.ycl.jxkg.vo.admin.question.QuestionEditRequestVO;
+import com.ycl.jxkg.vo.student.exam.ExamPaperSubmitItemVO;
+import com.ycl.jxkg.vo.student.question.answer.QuestionAnswerVO;
+import com.ycl.jxkg.vo.student.question.answer.QuestionPageStudentRequestVO;
+import com.ycl.jxkg.vo.student.question.answer.QuestionPageStudentResponseVO;
import com.github.pagehelper.PageInfo;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,33 +42,34 @@
}
@RequestMapping(value = "/page", method = RequestMethod.POST)
- public RestResponse<PageInfo<QuestionPageStudentResponseVM>> pageList(@RequestBody QuestionPageStudentRequestVM model) {
+ public Result<PageInfo<QuestionPageStudentResponseVO>> pageList(@RequestBody QuestionPageStudentRequestVO model) {
model.setCreateUser(getCurrentUser().getId());
PageInfo<ExamPaperQuestionCustomerAnswer> pageInfo = examPaperQuestionCustomerAnswerService.studentPage(model);
- PageInfo<QuestionPageStudentResponseVM> page = PageInfoHelper.copyMap(pageInfo, q -> {
+ PageInfo<QuestionPageStudentResponseVO> page = PageInfoHelper.copyMap(pageInfo, q -> {
Subject subject = subjectService.selectById(q.getSubjectId());
- QuestionPageStudentResponseVM vm = modelMapper.map(q, QuestionPageStudentResponseVM.class);
- vm.setCreateTime(DateTimeUtil.dateFormat(q.getCreateTime()));
+ QuestionPageStudentResponseVO vo = new QuestionPageStudentResponseVO();
+ BeanUtils.copyProperties(q, vo);
+ vo.setCreateTime(DateTimeUtil.dateFormat(q.getCreateTime()));
TextContent textContent = textContentService.selectById(q.getQuestionTextContentId());
QuestionObject questionObject = JsonUtil.toJsonObject(textContent.getContent(), QuestionObject.class);
String clearHtml = HtmlUtil.clear(questionObject.getTitleContent());
- vm.setShortTitle(clearHtml);
- vm.setSubjectName(subject.getName());
- return vm;
+ vo.setShortTitle(clearHtml);
+ vo.setSubjectName(subject.getName());
+ return vo;
});
- return RestResponse.ok(page);
+ return Result.ok(page);
}
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
- public RestResponse<QuestionAnswerVM> select(@PathVariable Integer id) {
- QuestionAnswerVM vm = new QuestionAnswerVM();
+ public Result<QuestionAnswerVO> select(@PathVariable Integer id) {
+ QuestionAnswerVO vm = new QuestionAnswerVO();
ExamPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer = examPaperQuestionCustomerAnswerService.selectById(id);
- ExamPaperSubmitItemVM questionAnswerVM = examPaperQuestionCustomerAnswerService.examPaperQuestionCustomerAnswerToVM(examPaperQuestionCustomerAnswer);
- QuestionEditRequestVM questionVM = questionService.getQuestionEditRequestVM(examPaperQuestionCustomerAnswer.getQuestionId());
+ ExamPaperSubmitItemVO questionAnswerVM = examPaperQuestionCustomerAnswerService.examPaperQuestionCustomerAnswerToVM(examPaperQuestionCustomerAnswer);
+ QuestionEditRequestVO questionVM = questionService.getQuestionEditRequestVM(examPaperQuestionCustomerAnswer.getQuestionId());
vm.setQuestionVM(questionVM);
vm.setQuestionAnswerVM(questionAnswerVM);
- return RestResponse.ok(vm);
+ return Result.ok(vm);
}
}
--
Gitblit v1.8.0