refactor: 优化分页查询和代码生成模板

eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java

@@ -52,8 +52,8 @@ public class GeneratorController {
 
     @ApiOperation("查询数据库数据")
     @GetMapping(value = "/tables")
-    public ResponseEntity<PageResult<TableInfo>> queryTables(@RequestParam(defaultValue = "") String name, Page<Object> page){
+    public ResponseEntity<PageResult<TableInfo>> queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size){
-        return new ResponseEntity<>(generatorService.getTables(name, page), HttpStatus.OK);
+        return new ResponseEntity<>(generatorService.getTables(name, new Page<>(page, size)), HttpStatus.OK);
     }
 
     @ApiOperation("查询字段数据")

eladmin/eladmin-generator/src/main/resources/generator.properties

@@ -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

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<PageResult<${className}>> query${className}(${className}QueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<${className}>> query${className}(${className}QueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,page),HttpStatus.OK);
     }
 

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;
 </#if>
+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>
 

eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/dto/SysLogQueryCriteria.java

@@ -39,4 +39,10 @@ public class SysLogQueryCriteria {
 
     @ApiModelProperty(value = "创建时间")
     private List<Timestamp> createTime;
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private Integer page = 1;
+
+    @ApiModelProperty(value = "每页数据量", example = "10")
+    private Integer size = 10;
 }

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<PageResult<SysLog>> queryLog(SysLogQueryCriteria criteria, Page<SysLog> page){
+    public ResponseEntity<PageResult<SysLog>> queryLog(SysLogQueryCriteria criteria){
         criteria.setLogType("INFO");
+        Page<SysLog> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK);
     }
 
     @GetMapping(value = "/user")
     @ApiOperation("用户日志查询")
-    public ResponseEntity<PageResult<SysLog>> queryUserLog(SysLogQueryCriteria criteria, Page<SysLog> page){
+    public ResponseEntity<PageResult<SysLog>> queryUserLog(SysLogQueryCriteria criteria){
         criteria.setLogType("INFO");
         criteria.setUsername(SecurityUtils.getCurrentUsername());
+        Page<SysLog> 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<PageResult<SysLog>> queryErrorLog(SysLogQueryCriteria criteria, Page<SysLog> page){
+    public ResponseEntity<PageResult<SysLog>> queryErrorLog(SysLogQueryCriteria criteria){
         criteria.setLogType("ERROR");
+        Page<SysLog> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK);
     }
 

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<Timestamp> createTime;
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private Integer page = 1;
+
+    @ApiModelProperty(value = "每页数据量", example = "10")
+    private Integer size = 10;
 }

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<PageResult<QuartzJob>> queryQuartzJob(QuartzJobQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<QuartzJob>> queryQuartzJob(QuartzJobQueryCriteria criteria){
+        Page<Object> 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<PageResult<QuartzLog>> queryQuartzJobLog(QuartzJobQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<QuartzLog>> queryQuartzJobLog(QuartzJobQueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(quartzJobService.queryAllLog(criteria,page), HttpStatus.OK);
     }
 

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;
 }

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;
 }

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<Timestamp> createTime;
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private Integer page = 1;
+
+    @ApiModelProperty(value = "每页数据量", example = "10")
+    private Integer size = 10;
 }

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<Timestamp> createTime;
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private Integer page = 1;
+
+    @ApiModelProperty(value = "每页数据量", example = "10")
+    private Integer size = 10;
 }

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<Timestamp> createTime;
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private Integer page = 1;
+
+    @ApiModelProperty(value = "每页数据量", example = "10")
+    private Integer size = 10;
 }

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<Object> getDeptSuperior(@RequestBody List<Long> ids,
+    public ResponseEntity<Object> getDeptSuperior(@RequestBody List<Long> ids, @RequestParam(defaultValue = "false") Boolean exclude) {
-                                                  @RequestParam(defaultValue = "false") Boolean exclude) {
         Set<Dept> deptSet  = new LinkedHashSet<>();
         for (Long id : ids) {
             Dept dept = deptService.findById(id);

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<PageResult<Dict>> queryDict(DictQueryCriteria resources, Page<Object> page){
+    public ResponseEntity<PageResult<Dict>> queryDict(DictQueryCriteria criteria){
-        return new ResponseEntity<>(dictService.queryAll(resources, page),HttpStatus.OK);
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        return new ResponseEntity<>(dictService.queryAll(criteria, page),HttpStatus.OK);
     }
 
     @Log("新增字典")

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java

@@ -49,7 +49,8 @@ public class DictDetailController {
 
     @ApiOperation("查询字典详情")
     @GetMapping
-    public ResponseEntity<PageResult<DictDetail>> queryDictDetail(DictDetailQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<DictDetail>> queryDictDetail(DictDetailQueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(dictDetailService.queryAll(criteria, page),HttpStatus.OK);
     }
 

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<PageResult<Job>> queryJob(JobQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<Job>> queryJob(JobQueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(jobService.queryAll(criteria, page),HttpStatus.OK);
     }
 

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<PageResult<Role>> queryRole(RoleQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<Role>> queryRole(RoleQueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(roleService.queryAll(criteria, page),HttpStatus.OK);
     }
 

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<PageResult<User>> queryUser(UserQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<User>> queryUser(UserQueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
             criteria.getDeptIds().add(criteria.getDeptId());
             // 先查找是否存在子节点

eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/LocalStorageQueryCriteria.java

@@ -32,4 +32,10 @@ public class LocalStorageQueryCriteria{
 
     @ApiModelProperty(value = "创建时间")
     private List<Timestamp> createTime;
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private Integer page = 1;
+
+    @ApiModelProperty(value = "每页数据量", example = "10")
+    private Integer size = 10;
 }

eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/dto/QiniuQueryCriteria.java

@@ -32,4 +32,10 @@ public class QiniuQueryCriteria{
 
     @ApiModelProperty(value = "创建时间")
     private List<Timestamp> createTime;
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private Integer page = 1;
+
+    @ApiModelProperty(value = "每页数据量", example = "10")
+    private Integer size = 10;
 }

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<PageResult<LocalStorage>> queryFile(LocalStorageQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<LocalStorage>> queryFile(LocalStorageQueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(localStorageService.queryAll(criteria,page),HttpStatus.OK);
     }
 

eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java

@@ -74,7 +74,8 @@ public class QiniuController {
 
     @ApiOperation("查询文件")
     @GetMapping
-    public ResponseEntity<PageResult<QiniuContent>> queryQiNiu(QiniuQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<QiniuContent>> queryQiNiu(QiniuQueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(qiniuContentService.queryAll(criteria, page),HttpStatus.OK);
     }