|
|
@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
|
|
|
+import vip.xiaonuo.common.pojo.CommonResult;
|
|
|
import vip.xiaonuo.exam.base.BaseApiController;
|
|
|
import vip.xiaonuo.exam.base.RestResponse;
|
|
|
import vip.xiaonuo.exam.domain.TaskExam;
|
|
|
@@ -44,7 +45,7 @@ public class DashboardController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/index", method = RequestMethod.POST)
|
|
|
- public RestResponse<IndexVM> index() {
|
|
|
+ public CommonResult<IndexVM> index() {
|
|
|
IndexVM indexVM = new IndexVM();
|
|
|
SaBaseLoginUser user = getCurrentUser();
|
|
|
|
|
|
@@ -66,16 +67,16 @@ public class DashboardController extends BaseApiController {
|
|
|
return vm;
|
|
|
}).collect(Collectors.toList());
|
|
|
indexVM.setTimeLimitPaper(paperInfoVMS);
|
|
|
- return RestResponse.ok(indexVM);
|
|
|
+ return CommonResult.data(indexVM);
|
|
|
}
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "/task", method = RequestMethod.POST)
|
|
|
- public RestResponse<List<TaskItemVm>> task() {
|
|
|
+ public CommonResult<List<TaskItemVm>> task() {
|
|
|
SaBaseLoginUser user = getCurrentUser();
|
|
|
List<TaskExam> taskExams = taskExamService.getByGradeLevel(user.getSortCode());
|
|
|
if (taskExams.size() == 0) {
|
|
|
- return RestResponse.ok(new ArrayList<>());
|
|
|
+ return CommonResult.data(new ArrayList<>());
|
|
|
}
|
|
|
List<Integer> tIds = taskExams.stream().map(taskExam -> taskExam.getId()).collect(Collectors.toList());
|
|
|
List<TaskExamCustomerAnswer> taskExamCustomerAnswers = taskExamCustomerAnswerService.selectByTUid(tIds, user.getId());
|
|
|
@@ -89,7 +90,7 @@ public class DashboardController extends BaseApiController {
|
|
|
itemVm.setPaperItems(paperItemVMS);
|
|
|
return itemVm;
|
|
|
}).collect(Collectors.toList());
|
|
|
- return RestResponse.ok(vm);
|
|
|
+ return CommonResult.data(vm);
|
|
|
}
|
|
|
|
|
|
|