用户管理/用户概览

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/UserController.java

@@ -37,7 +37,7 @@ public class UserController {
     }
 
     @GetMapping("/getIncrementListByUserId")
-    public ResultData getIncrementListByUserId(@RequestParam(required = false) Long userId,
+    public ResultData getIncrementListByUserId(@RequestParam(required = false)Long userId,
                                                @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                                @RequestParam(required = false,defaultValue = "10") Integer pageSize){
         return ResultData.ok(userIncrementService.pageList(userId,pageNum,pageSize));
@@ -71,7 +71,7 @@ public class UserController {
     }
 
     @GetMapping("/getCameraDetail")
-    public ResultData getCameraDetail(@RequestParam(required = false) Long userId,
+    public ResultData getCameraDetail(@RequestParam(required = false)Long userId,
                                       @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                       @RequestParam(required = false,defaultValue = "10") Integer pageSize){
         if(userId == null){

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/ICameraService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.Camera;
 
 import java.util.List;
@@ -17,5 +18,5 @@ public interface ICameraService extends IService<Camera> {
 
     List<Camera> getListByCameraIdList(List<Long> cameraIdList);
 
-    Object getCameraByUserId(Integer pageNum, Integer pageSize, Long userId);
+    PageInfo getCameraByUserId(Integer pageNum, Integer pageSize, Long userId);
 }