From c31dcb671cf12011b80cc2ab42d74380a2571678 Mon Sep 17 00:00:00 2001 From: Jie Zheng <201507802@qq.com> Date: Tue, 14 Jan 2025 14:10:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=92=8C=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/zhengjie/rest/GeneratorController.java | 4 +-- .../src/main/resources/gen.properties | 0 .../src/main/resources/generator.properties | 27 ------------------- .../resources/template/admin/Controller.ftl | 3 ++- .../template/admin/QueryCriteria.ftl | 7 +++++ .../domain/dto/SysLogQueryCriteria.java | 6 +++++ .../me/zhengjie/rest/SysLogController.java | 10 ++++--- .../domain/dto/QuartzJobQueryCriteria.java | 6 +++++ .../quartz/rest/QuartzJobController.java | 6 +++-- .../domain/dto/DictDetailQueryCriteria.java | 6 +++++ .../system/domain/dto/DictQueryCriteria.java | 6 +++++ .../system/domain/dto/JobQueryCriteria.java | 6 +++++ .../system/domain/dto/RoleQueryCriteria.java | 6 +++++ .../system/domain/dto/UserQueryCriteria.java | 6 +++++ .../modules/system/rest/DeptController.java | 3 +-- .../modules/system/rest/DictController.java | 5 ++-- .../system/rest/DictDetailController.java | 3 ++- .../modules/system/rest/JobController.java | 3 ++- .../modules/system/rest/RoleController.java | 3 ++- .../modules/system/rest/UserController.java | 3 ++- .../domain/dto/LocalStorageQueryCriteria.java | 6 +++++ .../domain/dto/QiniuQueryCriteria.java | 6 +++++ .../zhengjie/rest/LocalStorageController.java | 3 ++- .../me/zhengjie/rest/QiniuController.java | 3 ++- 24 files changed, 92 insertions(+), 45 deletions(-) rename eladmin/{eladmin-system => eladmin-generator}/src/main/resources/gen.properties (100%) delete mode 100644 eladmin/eladmin-generator/src/main/resources/generator.properties diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java index 1067a42..24d253f 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java @@ -52,8 +52,8 @@ public class GeneratorController { @ApiOperation("查询数据库数据") @GetMapping(value = "/tables") - public ResponseEntity> queryTables(@RequestParam(defaultValue = "") String name, Page page){ - return new ResponseEntity<>(generatorService.getTables(name, page), HttpStatus.OK); + public ResponseEntity> queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size){ + return new ResponseEntity<>(generatorService.getTables(name, new Page<>(page, size)), HttpStatus.OK); } @ApiOperation("查询字段数据") diff --git a/eladmin/eladmin-system/src/main/resources/gen.properties b/eladmin/eladmin-generator/src/main/resources/gen.properties similarity index 100% rename from eladmin/eladmin-system/src/main/resources/gen.properties rename to eladmin/eladmin-generator/src/main/resources/gen.properties diff --git a/eladmin/eladmin-generator/src/main/resources/generator.properties b/eladmin/eladmin-generator/src/main/resources/generator.properties deleted file mode 100644 index e64d060..0000000 --- a/eladmin/eladmin-generator/src/main/resources/generator.properties +++ /dev/null @@ -1,27 +0,0 @@ -# Database type to Java type -tinyint=Integer -smallint=Integer -mediumint=Integer -int=Integer -integer=Integer - -bigint=Long - -float=Float - -double=Double - -decimal=BigDecimal - -bit=Boolean - -char=String -varchar=String -tinytext=String -text=String -mediumtext=String -longtext=String - -date=Timestamp -datetime=Timestamp -timestamp=Timestamp \ No newline at end of file diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl index 9a37c6f..48cc631 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl @@ -54,7 +54,8 @@ public class ${className}Controller { @GetMapping @ApiOperation("查询${apiAlias}") @PreAuthorize("@el.check('${changeClassName}:list')") - public ResponseEntity> query${className}(${className}QueryCriteria criteria, Page page){ + public ResponseEntity> query${className}(${className}QueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,page),HttpStatus.OK); } diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl index 01cae97..dea890b 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl @@ -25,6 +25,7 @@ import java.math.BigDecimal; <#if betweens?? && (betweens?size > 0)> import java.util.List; +import io.swagger.annotations.ApiModelProperty; /** * @author ${author} @@ -32,6 +33,12 @@ import java.util.List; **/ @Data public class ${className}QueryCriteria{ + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; <#if queryColumns??> <#list queryColumns as column> diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/dto/SysLogQueryCriteria.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/dto/SysLogQueryCriteria.java index fed8400..c09be41 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/dto/SysLogQueryCriteria.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/dto/SysLogQueryCriteria.java @@ -39,4 +39,10 @@ public class SysLogQueryCriteria { @ApiModelProperty(value = "创建时间") private List createTime; + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; } diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java index 8e3d556..f8ce052 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java @@ -61,27 +61,31 @@ public class SysLogController { criteria.setLogType("ERROR"); sysLogService.download(sysLogService.queryAll(criteria), response); } + @GetMapping @ApiOperation("日志查询") @PreAuthorize("@el.check()") - public ResponseEntity> queryLog(SysLogQueryCriteria criteria, Page page){ + public ResponseEntity> queryLog(SysLogQueryCriteria criteria){ criteria.setLogType("INFO"); + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK); } @GetMapping(value = "/user") @ApiOperation("用户日志查询") - public ResponseEntity> queryUserLog(SysLogQueryCriteria criteria, Page page){ + public ResponseEntity> queryUserLog(SysLogQueryCriteria criteria){ criteria.setLogType("INFO"); criteria.setUsername(SecurityUtils.getCurrentUsername()); + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(sysLogService.queryAllByUser(criteria,page), HttpStatus.OK); } @GetMapping(value = "/error") @ApiOperation("错误日志查询") @PreAuthorize("@el.check()") - public ResponseEntity> queryErrorLog(SysLogQueryCriteria criteria, Page page){ + public ResponseEntity> queryErrorLog(SysLogQueryCriteria criteria){ criteria.setLogType("ERROR"); + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/dto/QuartzJobQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/dto/QuartzJobQueryCriteria.java index a198a2d..8cda512 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/dto/QuartzJobQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/dto/QuartzJobQueryCriteria.java @@ -35,4 +35,10 @@ public class QuartzJobQueryCriteria { @ApiModelProperty(value = "创建时间") private List createTime; + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java index 50b3876..3047037 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java @@ -54,7 +54,8 @@ public class QuartzJobController { @ApiOperation("查询定时任务") @GetMapping @PreAuthorize("@el.check('timing:list')") - public ResponseEntity> queryQuartzJob(QuartzJobQueryCriteria criteria, Page page){ + public ResponseEntity> queryQuartzJob(QuartzJobQueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(quartzJobService.queryAll(criteria,page), HttpStatus.OK); } @@ -75,7 +76,8 @@ public class QuartzJobController { @ApiOperation("查询任务执行日志") @GetMapping(value = "/logs") @PreAuthorize("@el.check('timing:list')") - public ResponseEntity> queryQuartzJobLog(QuartzJobQueryCriteria criteria, Page page){ + public ResponseEntity> queryQuartzJobLog(QuartzJobQueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(quartzJobService.queryAllLog(criteria,page), HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictDetailQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictDetailQueryCriteria.java index b35d1ea..1c42c9e 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictDetailQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictDetailQueryCriteria.java @@ -30,4 +30,10 @@ public class DictDetailQueryCriteria { @ApiModelProperty(value = "字典名称") private String dictName; + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; } \ No newline at end of file diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictQueryCriteria.java index 329691d..7b492da 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictQueryCriteria.java @@ -27,4 +27,10 @@ public class DictQueryCriteria { @ApiModelProperty(value = "模糊查询") private String blurry; + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/JobQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/JobQueryCriteria.java index 62f8578..f865918 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/JobQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/JobQueryCriteria.java @@ -37,4 +37,10 @@ public class JobQueryCriteria { @ApiModelProperty(value = "创建时间") private List createTime; + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; } \ No newline at end of file diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java index 325955d..05c3f5c 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java @@ -32,4 +32,10 @@ public class RoleQueryCriteria { @ApiModelProperty(value = "创建时间") private List createTime; + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java index 464f989..0815c93 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java @@ -47,4 +47,10 @@ public class UserQueryCriteria implements Serializable { @ApiModelProperty(value = "创建时间") private List createTime; + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java index a9baf51..593a4fa 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java @@ -66,8 +66,7 @@ public class DeptController { @ApiOperation("查询部门:根据ID获取同级与上级数据") @PostMapping("/superior") @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity getDeptSuperior(@RequestBody List ids, - @RequestParam(defaultValue = "false") Boolean exclude) { + public ResponseEntity getDeptSuperior(@RequestBody List ids, @RequestParam(defaultValue = "false") Boolean exclude) { Set deptSet = new LinkedHashSet<>(); for (Long id : ids) { Dept dept = deptService.findById(id); diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java index d66ba52..8f53bc8 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java @@ -65,8 +65,9 @@ public class DictController { @ApiOperation("查询字典") @GetMapping @PreAuthorize("@el.check('dict:list')") - public ResponseEntity> queryDict(DictQueryCriteria resources, Page page){ - return new ResponseEntity<>(dictService.queryAll(resources, page),HttpStatus.OK); + public ResponseEntity> queryDict(DictQueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); + return new ResponseEntity<>(dictService.queryAll(criteria, page),HttpStatus.OK); } @Log("新增字典") diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java index 9439cb6..ceae024 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java @@ -49,7 +49,8 @@ public class DictDetailController { @ApiOperation("查询字典详情") @GetMapping - public ResponseEntity> queryDictDetail(DictDetailQueryCriteria criteria, Page page){ + public ResponseEntity> queryDictDetail(DictDetailQueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(dictDetailService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java index 81cca59..dbe6d29 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java @@ -57,7 +57,8 @@ public class JobController { @ApiOperation("查询岗位") @GetMapping @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity> queryJob(JobQueryCriteria criteria, Page page){ + public ResponseEntity> queryJob(JobQueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(jobService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java index 469a492..3ad27e4 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java @@ -77,7 +77,8 @@ public class RoleController { @ApiOperation("查询角色") @GetMapping @PreAuthorize("@el.check('roles:list')") - public ResponseEntity> queryRole(RoleQueryCriteria criteria, Page page){ + public ResponseEntity> queryRole(RoleQueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(roleService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java index 67c35ae..5860e4e 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java @@ -76,7 +76,8 @@ public class UserController { @ApiOperation("查询用户") @GetMapping @PreAuthorize("@el.check('user:list')") - public ResponseEntity> queryUser(UserQueryCriteria criteria, Page page){ + public ResponseEntity> queryUser(UserQueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); if (!ObjectUtils.isEmpty(criteria.getDeptId())) { criteria.getDeptIds().add(criteria.getDeptId()); // 先查找是否存在子节点 diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/LocalStorageQueryCriteria.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/LocalStorageQueryCriteria.java index b59cfd9..459cd06 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/LocalStorageQueryCriteria.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/LocalStorageQueryCriteria.java @@ -32,4 +32,10 @@ public class LocalStorageQueryCriteria{ @ApiModelProperty(value = "创建时间") private List createTime; + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; } \ No newline at end of file diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/QiniuQueryCriteria.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/QiniuQueryCriteria.java index ec98e52..26e22e1 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/QiniuQueryCriteria.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/QiniuQueryCriteria.java @@ -32,4 +32,10 @@ public class QiniuQueryCriteria{ @ApiModelProperty(value = "创建时间") private List createTime; + + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; } diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java index 39f0427..0ee4465 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java @@ -49,7 +49,8 @@ public class LocalStorageController { @GetMapping @ApiOperation("查询文件") @PreAuthorize("@el.check('storage:list')") - public ResponseEntity> queryFile(LocalStorageQueryCriteria criteria, Page page){ + public ResponseEntity> queryFile(LocalStorageQueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(localStorageService.queryAll(criteria,page),HttpStatus.OK); } diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java index 017c045..f12a3fc 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java @@ -74,7 +74,8 @@ public class QiniuController { @ApiOperation("查询文件") @GetMapping - public ResponseEntity> queryQiNiu(QiniuQueryCriteria criteria, Page page){ + public ResponseEntity> queryQiNiu(QiniuQueryCriteria criteria){ + Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(qiniuContentService.queryAll(criteria, page),HttpStatus.OK); }