diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java index f2fb633..6254072 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java @@ -30,6 +30,6 @@ public class CoordinatePhotoReqVo { */ private String keyWord; - private int pageNum; - private int pageSize; + private int page; + private int limit; } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java index 7fdaf05..b88c7e7 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java @@ -31,6 +31,6 @@ public class ImportantMatterReqVo { */ private String keyWord; - private int pageNum; - private int pageSize; + private int page; + private int limit; } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java index a8ef750..69f5533 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java @@ -30,6 +30,6 @@ public class SafetyMeasuresReqVo { */ private String keyWord; - private int pageNum; - private int pageSize; + private int page; + private int limit; } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java index f365e75..61296c1 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java @@ -44,7 +44,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { */ @Override public ServerResponse getCoordinatePhotoList(CoordinatePhotoReqVo data) { - PageHelper.startPage(data.getPageNum(), data.getPageSize()); + PageHelper.startPage(data.getPage(), data.getLimit()); try { List list = coordinatePhotoMapper.getCoordinatePhotoList(data); //获取图片信息 @@ -53,7 +53,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { coordinatePhotoVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); - 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/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java index 4e2988b..186e417 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java @@ -44,7 +44,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { */ @Override public ServerResponse getImportantMatterList(ImportantMatterReqVo data) { - PageHelper.startPage(data.getPageNum(), data.getPageSize()); + PageHelper.startPage(data.getPage(), data.getLimit()); try { List list = importantMatterMapper.getImportantMatterList(data); //获取图片信息 @@ -53,7 +53,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { importantMatterVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); - 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/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java index 1ad833d..04f6a2f 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java @@ -44,7 +44,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { */ @Override public ServerResponse getSafetyMeasuresList(SafetyMeasuresReqVo data) { - PageHelper.startPage(data.getPageNum(), data.getPageSize()); + PageHelper.startPage(data.getPage(), data.getLimit()); try { List list = safetyMeasuresMapper.getSafetyMeasuresList(data); //获取图片信息 @@ -53,7 +53,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { safetyMeasuresVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); - 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("查询失败");