diff --git a/src/main/java/com/youlai/boot/common/result/PageResult.java b/src/main/java/com/youlai/boot/common/result/PageResult.java index 72fee0b..8185868 100644 --- a/src/main/java/com/youlai/boot/common/result/PageResult.java +++ b/src/main/java/com/youlai/boot/common/result/PageResult.java @@ -37,10 +37,13 @@ public class PageResult implements Serializable { ? Collections.emptyList() : page.getRecords(); PageData pageData = new PageData<>(); - pageData.setList(records); - pageData.setTotal(page != null ? page.getTotal() : 0L); - result.setData(pageData); + pageData.setRecords(records); + pageData.setTotal(page.getTotal()); + pageData.setSize(page.getSize()); + pageData.setCurrent(page.getCurrent()); + pageData.setPages(page.getPages()); + result.setData(pageData); return result; } @@ -54,7 +57,7 @@ public class PageResult implements Serializable { result.setCode(ResultCode.SUCCESS.getCode()); result.setMsg(ResultCode.SUCCESS.getMsg()); PageData pageData = new PageData<>(); - pageData.setList(list != null ? list : Collections.emptyList()); + pageData.setRecords(list != null ? list : Collections.emptyList()); pageData.setTotal(0L); result.setData(pageData); return result; @@ -63,9 +66,15 @@ public class PageResult implements Serializable { @Data public static class PageData { - private List list; + private List records; private long total; + + private long size; + + private long current; + + private long pages; } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 16a2d8b..de3307d 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -161,10 +161,10 @@ springdoc: paths-to-match: "/**" # 匹配的请求路径 packages-to-scan: # 扫描的 Controller 包,限制只生成指定包的接口文档 - com.youlai.boot.auth.controller - - com.youlai.boot.system.controller +# - com.youlai.boot.system.controller - com.youlai.boot.mini.controller - - com.youlai.boot.module.file.controller - - com.youlai.boot.module.codegen.controller +# - com.youlai.boot.module.file.controller +# - com.youlai.boot.module.codegen.controller default-flat-param-object: true # 将对象参数扁平化显示在文档中 # knife4j 配置