diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbCablewaTransController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbCablewaTransController.java index 5ff1597..ee2ee62 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbCablewaTransController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbCablewaTransController.java @@ -39,7 +39,7 @@ public class TbCablewaTransController { @DecryptAndVerify(decryptedClass = TbCablewaTransVo.class)//加解密统一管理 @LogAnnotation(operModul = "杆塔管理-查询列表", operation = "查询列表", operDesc = "系统级事件",operType="查询") public ServerResponse getTbTowerList(EncryptedReq dto) { - PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize()); + PageHelper.startPage(dto.getData().getPage(), dto.getData().getLimit()); return tbCablewaTransService.tbCablewaTransList(dto.getData()); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java index 3e32a77..69e77f9 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java @@ -39,7 +39,7 @@ public class TbProjectController { @DecryptAndVerify(decryptedClass = TbProjectVo.class)//加解密统一管理 @LogAnnotation(operModul = "基础管理-线路工程管理", operation = "查询列表", operDesc = "系统级事件",operType="查询") public ServerResponse getTbProjectList(EncryptedReq dto) { - + PageHelper.startPage(dto.getData().getPage(), dto.getData().getLimit()); return tbProjectService.getTbProjectList(dto.getData()); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java index 6aaa64b..d108660 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java @@ -39,7 +39,7 @@ public class TbThreeSpanController { @DecryptAndVerify(decryptedClass = TbThreeSpanVo.class)//加解密统一管理 @LogAnnotation(operModul = "三跨管理-查询列表", operation = "查询列表", operDesc = "系统级事件",operType="查询") public ServerResponse getTbThreeSpanList(EncryptedReq dto) { - PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize()); + PageHelper.startPage(dto.getData().getPage(), dto.getData().getLimit()); return tbThreeSpanService.getTbThreeSpanList(dto.getData()); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java index 74ae77c..3007607 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java @@ -41,7 +41,7 @@ public class TbTowerController { @DecryptAndVerify(decryptedClass = TbTowerVo.class)//加解密统一管理 @LogAnnotation(operModul = "杆塔管理-查询列表", operation = "查询列表", operDesc = "系统级事件",operType="查询") public ServerResponse getTbTowerList(EncryptedReq dto) { - PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize()); + PageHelper.startPage(dto.getData().getPage(), dto.getData().getLimit()); return tbTowerService.getTbTowerList(dto.getData()); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java index 5f59b7c..17bb249 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java @@ -34,7 +34,7 @@ public class TbCablewaTransServiceImpl implements TbCablewaTransService { try { List tbCablewaTransVoList = tbCablewaTransMapper.tbCablewaTransList(data); PageInfo pageInfo = new PageInfo<>(tbCablewaTransVoList); - return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); + return ServerResponse.createSuccessPage(pageInfo, data.getPage(), data.getLimit()); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("索道运输-查询列表失败"); diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java index 691c115..c9a1c20 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java @@ -55,7 +55,6 @@ public class TbProjectServiceImpl implements TbProjectService { List deptIds = UserUtil.getLoginUser().getDeparts(); //List deptIds = tbProjectMapper.getDataAuthByDeptId(deptId); data.setDeptIds(deptIds); - PageHelper.startPage(data.getPageNum(), data.getPageSize()); //获取工程列表 List tbProjectVoList = tbProjectMapper.getTbProjectList(data); TbTowerVo tbTowerVo = new TbTowerVo(); @@ -78,7 +77,7 @@ public class TbProjectServiceImpl implements TbProjectService { } } PageInfo pageInfo = new PageInfo<>(tbProjectVoList); - return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); + return ServerResponse.createSuccessPage(pageInfo, data.getPage(), data.getLimit()); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("线路工程管理-查询列表失败"); diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java index 1b87549..d48355a 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java @@ -48,7 +48,7 @@ public class TbThreeSpanServiceImpl implements TbThreeSpanService { } } PageInfo pageInfo = new PageInfo<>(tbThreeSpanVoList); - return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); + return ServerResponse.createSuccessPage(pageInfo, data.getPage(), data.getLimit()); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("三跨管理-查询列表失败"); diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java index a1da102..8b6af8f 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java @@ -34,7 +34,7 @@ public class TbTowerServiceImpl implements TbTowerService { try { List tbTowerVoList = tbTowerMapper.getTbProjectList(data); PageInfo pageInfo = new PageInfo<>(tbTowerVoList); - return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); + return ServerResponse.createSuccessPage(pageInfo, data.getPage(), data.getLimit()); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("杆塔管理-查询列表失败"); diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java index d8d0a60..b59fb8e 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java @@ -87,6 +87,6 @@ public class TbCablewaTransVo { */ private String keyWord; - private int pageNum = 1; - private int pageSize = 10; + private int page = 1; + private int limit = 10; } diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java index 51bedaf..9b47697 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java @@ -137,6 +137,6 @@ public class TbProjectVo { */ private List tbCablewaTransVoList; - private int pageNum = 1; - private int pageSize = 10; + private int page = 1; + private int limit = 10; } diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java index ec71c4f..6be1f4d 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java @@ -134,6 +134,6 @@ public class TbThreeSpanVo { */ private String keyWord; - private int pageNum = 1; - private int pageSize = 10; + private int page = 1; + private int limit = 10; } diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java index c5d9619..0f1a265 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java @@ -103,6 +103,6 @@ public class TbTowerVo { */ private Long updateUserId; - private int pageNum = 1; - private int pageSize = 10; + private int page = 1; + private int limit = 10; }