分页参数修改

src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

@@ -51,12 +51,12 @@ public class LaserService {
     public PageInfo pageList(SceneParam param) {
         LaserSceneParam laserSceneParam = getLaserSceneParam(param);
         if(laserSceneParam == null ){
-            return PageInfo.PageInfoEmpty(param.getPage(),param.getLimit());
+            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
         }
         FdkkResponse response = laserClient.sceneList(laserSceneParam);
         JSONObject jsonObject =response.getData();
         if(jsonObject == null){
-            return PageInfo.PageInfoEmpty(param.getPage(),param.getLimit());
+            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
         }
         JSONArray list = jsonObject.getJSONArray("list");
         long total =jsonObject.getLong("total");
@@ -92,7 +92,7 @@ public class LaserService {
             }
         }
 
-        Page<SceneVo> voPage = new Page<>(param.getPage(),param.getLimit());
+        Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
         voPage.setRecords(sceneVoList);
         voPage.setTotal(total);
         return PageInfo.PageInfo(voPage);

src/main/java/com/fdkankan/manage_jp/service/impl/CameraServiceImpl.java

@@ -58,7 +58,7 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
 
     @Override
     public Object pageList(CameraListParam param) {
-        Page<ResponseCamera> page = this.getBaseMapper().pageList(new Page<>(param.getPage(),param.getLimit()),param);
+        Page<ResponseCamera> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         for (ResponseCamera record : page.getRecords()) {
             record.setCameraType(record.getType());
         }

src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -89,7 +89,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(param.getType() == 2){  //深时
             return laserService.pageList(param);
         }
-        Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPage(),param.getLimit()),param);
+        Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         for (SceneVo record : page.getRecords()) {
             Company company = companyService.getByCameraId(record.getCameraId());
             if(company != null){

src/main/java/com/fdkankan/manage_jp/service/impl/UserServiceImpl.java

@@ -157,7 +157,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             wrapper.like(User::getUserName,param.getPhoneNum());
         }
         wrapper.orderByDesc(User::getCreateTime);
-        Page<User> page = this.page(new Page<>(param.getPage(), param.getLimit()), wrapper);
+        Page<User> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<UserVo> userVos = new ArrayList<>();
         for (User record : page.getRecords()) {
             UserVo vo = new UserVo();
@@ -175,7 +175,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             }
             userVos.add(vo);
         }
-        Page<UserVo> pageVo = new Page<>(param.getPage(),param.getLimit());
+        Page<UserVo> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
         pageVo.setTotal(page.getTotal());
         pageVo.setRecords(userVos);
         return PageInfo.PageInfo(pageVo);

src/main/java/com/fdkankan/manage_jp/vo/request/CameraListParam.java

@@ -1,10 +1,9 @@
 package com.fdkankan.manage_jp.vo.request;
 
+import com.fdkankan.manage_jp.common.RequestBase;
 import lombok.Data;
 
 @Data
-public class CameraListParam {
-    private Integer page = 1;
-    private Integer limit = 20;
+public class CameraListParam extends RequestBase {
     private String searchKey;
 }

src/main/java/com/fdkankan/manage_jp/vo/request/SceneParam.java

@@ -1,13 +1,12 @@
 package com.fdkankan.manage_jp.vo.request;
 
+import com.fdkankan.manage_jp.common.RequestBase;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class SceneParam {
-    private Integer page = 1;
-    private Integer limit = 20;
+public class SceneParam extends RequestBase {
     private String childName;
     private String companyName;
     private String sceneName;

src/main/java/com/fdkankan/manage_jp/vo/request/UserListParam.java

@@ -1,10 +1,9 @@
 package com.fdkankan.manage_jp.vo.request;
 
+import com.fdkankan.manage_jp.common.RequestBase;
 import lombok.Data;
 
 @Data
-public class UserListParam {
-    private Integer page = 1;
-    private Integer limit = 20;
+public class UserListParam extends RequestBase {
     private String phoneNum;
 }