Ver Fonte

修改Dashboard相关接口改造为框架接口格式

zhaosongshan há 7 meses atrás
pai
commit
d02e567b22

+ 3 - 2
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/admin/DashboardController.java

@@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.exam.base.BaseApiController;
 import vip.xiaonuo.exam.base.RestResponse;
 import vip.xiaonuo.exam.service.*;
@@ -32,7 +33,7 @@ public class DashboardController extends BaseApiController {
     }
 
     @RequestMapping(value = "/index", method = RequestMethod.POST)
-    public RestResponse<IndexVM> Index() {
+    public CommonResult<IndexVM> Index() {
         IndexVM vm = new IndexVM();
 
         Integer examPaperCount = examPaperService.selectAllCount();
@@ -51,6 +52,6 @@ public class DashboardController extends BaseApiController {
         vm.setMothDayDoExamQuestionValue(mothDayDoExamQuestionValue);
 
         vm.setMothDayText(DateTimeUtil.MothDay());
-        return RestResponse.ok(vm);
+        return CommonResult.data(vm);
     }
 }

+ 6 - 5
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/DashboardController.java

@@ -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);
     }