From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/restcontroller/DashboardController.java | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/restcontroller/DashboardController.java b/src/main/java/com/ots/project/exam/restcontroller/DashboardController.java
index ffb8b2b..33b37ef 100644
--- a/src/main/java/com/ots/project/exam/restcontroller/DashboardController.java
+++ b/src/main/java/com/ots/project/exam/restcontroller/DashboardController.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.restcontroller;
-
import com.ots.common.enums.ExamPaperTypeEnum;
import com.ots.project.common.BaseApiController;
import com.ots.project.exam.domain.ExamUser;
@@ -16,35 +15,28 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
-
@RestController("StudentDashboardController")
@RequestMapping(value = "/api/exam/dashboard")
@AllArgsConstructor
public class DashboardController extends BaseApiController {
-
@Autowired
private IExamPaperService examPaperService;
-
@RequestMapping(value = "/index", method = RequestMethod.POST)
public RestResponse<IndexVM> index() {
IndexVM indexVM = new IndexVM();
ExamUser user = getCurrentUser();
-
PaperFilter fixedPaperFilter = new PaperFilter();
fixedPaperFilter.setGradeLevel(user.getUserLevel());
fixedPaperFilter.setExamPaperType(ExamPaperTypeEnum.Fixed.getCode());
indexVM.setFixedPaper(examPaperService.indexPaper(fixedPaperFilter));
-
PaperFilter timeLimitPaperFilter = new PaperFilter();
timeLimitPaperFilter.setDateTime(new Date());
timeLimitPaperFilter.setGradeLevel(user.getUserLevel());
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);
@@ -55,7 +47,6 @@
indexVM.setTimeLimitPaper(paperInfoVMS);
return RestResponse.ok(indexVM);
}
-
@RequestMapping(value = "/task", method = RequestMethod.POST)
public RestResponse<List<TaskItemVm>> task() {
return RestResponse.ok(new ArrayList<>());
--
Gitblit v1.9.1