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/DashboardController.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java b/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java
index 26770bc..2b38b38 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/DashboardController.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.TaskExam;
import com.ycl.jxkg.domain.TaskExamCustomerAnswer;
import com.ycl.jxkg.domain.TextContent;
@@ -10,9 +10,10 @@
import com.ycl.jxkg.domain.task.TaskItemAnswerObject;
import com.ycl.jxkg.domain.task.TaskItemObject;
import com.ycl.jxkg.service.*;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.JsonUtil;
-import com.ycl.jxkg.viewmodel.student.dashboard.*;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.JsonUtil;
+import com.ycl.jxkg.vo.student.dashboard.*;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -45,14 +46,14 @@
}
@RequestMapping(value = "/index", method = RequestMethod.POST)
- public RestResponse<IndexVM> index() {
- IndexVM indexVM = new IndexVM();
+ public Result<IndexVO> index() {
+ IndexVO indexVO = new IndexVO();
User user = getCurrentUser();
PaperFilter fixedPaperFilter = new PaperFilter();
fixedPaperFilter.setGradeLevel(user.getUserLevel());
fixedPaperFilter.setExamPaperType(ExamPaperTypeEnum.Fixed.getCode());
- indexVM.setFixedPaper(examPaperService.indexPaper(fixedPaperFilter));
+ indexVO.setFixedPaper(examPaperService.indexPaper(fixedPaperFilter));
PaperFilter timeLimitPaperFilter = new PaperFilter();
timeLimitPaperFilter.setDateTime(new Date());
@@ -60,41 +61,42 @@
timeLimitPaperFilter.setExamPaperType(ExamPaperTypeEnum.TimeLimit.getCode());
List<PaperInfo> limitPaper = examPaperService.indexPaper(timeLimitPaperFilter);
- List<PaperInfoVM> paperInfoVMS = limitPaper.stream().map(d -> {
- PaperInfoVM vm = modelMapper.map(d, PaperInfoVM.class);
- vm.setStartTime(DateTimeUtil.dateFormat(d.getLimitStartTime()));
- vm.setEndTime(DateTimeUtil.dateFormat(d.getLimitEndTime()));
- return vm;
+ List<PaperInfoVO> paperInfoVOS = limitPaper.stream().map(d -> {
+ PaperInfoVO vo = new PaperInfoVO();
+ BeanUtils.copyProperties(d, vo);
+ vo.setStartTime(DateTimeUtil.dateFormat(d.getLimitStartTime()));
+ vo.setEndTime(DateTimeUtil.dateFormat(d.getLimitEndTime()));
+ return vo;
}).collect(Collectors.toList());
- indexVM.setTimeLimitPaper(paperInfoVMS);
- return RestResponse.ok(indexVM);
+ indexVO.setTimeLimitPaper(paperInfoVOS);
+ return Result.ok(indexVO);
}
@RequestMapping(value = "/task", method = RequestMethod.POST)
- public RestResponse<List<TaskItemVm>> task() {
+ public Result<List<TaskItemVO>> task() {
User user = getCurrentUser();
List<TaskExam> taskExams = taskExamService.getByGradeLevel(user.getUserLevel());
if (taskExams.size() == 0) {
- return RestResponse.ok(new ArrayList<>());
+ return Result.ok(new ArrayList<>());
}
List<Integer> tIds = taskExams.stream().map(taskExam -> taskExam.getId()).collect(Collectors.toList());
List<TaskExamCustomerAnswer> taskExamCustomerAnswers = taskExamCustomerAnswerService.selectByTUid(tIds, user.getId());
- List<TaskItemVm> vm = taskExams.stream().map(t -> {
- TaskItemVm itemVm = new TaskItemVm();
+ List<TaskItemVO> vm = taskExams.stream().map(t -> {
+ TaskItemVO itemVm = new TaskItemVO();
itemVm.setId(t.getId());
itemVm.setTitle(t.getTitle());
TaskExamCustomerAnswer taskExamCustomerAnswer = taskExamCustomerAnswers.stream()
.filter(tc -> tc.getTaskExamId().equals(t.getId())).findFirst().orElse(null);
- List<TaskItemPaperVm> paperItemVMS = getTaskItemPaperVm(t.getFrameTextContentId(), taskExamCustomerAnswer);
+ List<TaskItemPaperVO> paperItemVMS = getTaskItemPaperVm(t.getFrameTextContentId(), taskExamCustomerAnswer);
itemVm.setPaperItems(paperItemVMS);
return itemVm;
}).collect(Collectors.toList());
- return RestResponse.ok(vm);
+ return Result.ok(vm);
}
- private List<TaskItemPaperVm> getTaskItemPaperVm(Integer tFrameId, TaskExamCustomerAnswer taskExamCustomerAnswers) {
+ private List<TaskItemPaperVO> getTaskItemPaperVm(Integer tFrameId, TaskExamCustomerAnswer taskExamCustomerAnswers) {
TextContent textContent = textContentService.selectById(tFrameId);
List<TaskItemObject> paperItems = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemObject.class);
@@ -107,7 +109,7 @@
List<TaskItemAnswerObject> finalAnswerPaperItems = answerPaperItems;
return paperItems.stream().map(p -> {
- TaskItemPaperVm ivm = new TaskItemPaperVm();
+ TaskItemPaperVO ivm = new TaskItemPaperVO();
ivm.setExamPaperId(p.getExamPaperId());
ivm.setExamPaperName(p.getExamPaperName());
if (null != finalAnswerPaperItems) {
--
Gitblit v1.8.0