bonus
/
yn_img_tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2025-04-14 17:07:28 +08:00
parent d2a08d1b5f d214bb7664
commit 24d886cf61
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java
View File

@ -30,6 +30,6 @@ public class CoordinatePhotoReqVo {
*/
private String keyWord;
private int pageNum;
private int pageSize;
private int page;
private int limit;
}

4
src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java
View File

@ -31,6 +31,6 @@ public class ImportantMatterReqVo {
*/
private String keyWord;
private int pageNum;
private int pageSize;
private int page;
private int limit;
}

4
src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java
View File

@ -30,6 +30,6 @@ public class SafetyMeasuresReqVo {
*/
private String keyWord;
private int pageNum;
private int pageSize;
private int page;
private int limit;
}

4
src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java
View File

@ -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<CoordinatePhotoVo> list = coordinatePhotoMapper.getCoordinatePhotoList(data);
//获取图片信息
@ -53,7 +53,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService {
coordinatePhotoVo.setSysFileResourceList(sysFileResourceList);
}
PageInfo<CoordinatePhotoVo> 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("查询失败");

4
src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java
View File

@ -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<ImportantMatterVo> list = importantMatterMapper.getImportantMatterList(data);
//获取图片信息
@ -53,7 +53,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService {
importantMatterVo.setSysFileResourceList(sysFileResourceList);
}
PageInfo<ImportantMatterVo> 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("查询失败");

4
src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java
View File

@ -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<SafetyMeasuresVo> list = safetyMeasuresMapper.getSafetyMeasuresList(data);
//获取图片信息
@ -53,7 +53,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService {
safetyMeasuresVo.setSysFileResourceList(sysFileResourceList);
}
PageInfo<SafetyMeasuresVo> 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("查询失败");