From 9a391915a425121d87592f23aac7751e5d847f27 Mon Sep 17 00:00:00 2001 From: linzhijie <19970921lzj> Date: 星期三, 24 三月 2021 19:24:45 +0800 Subject: [PATCH] 去除泰国接口调用 --- src/main/java/com/ots/project/exam/restcontroller/DashboardController.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 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 33b37ef..ffb8b2b 100644 --- a/src/main/java/com/ots/project/exam/restcontroller/DashboardController.java +++ b/src/main/java/com/ots/project/exam/restcontroller/DashboardController.java @@ -1,4 +1,5 @@ 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; @@ -15,28 +16,35 @@ 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); @@ -47,6 +55,7 @@ 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