From f57fc1af38afa97b0b5c42327ecbaeb5af00c0b2 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Wed, 22 Apr 2026 11:24:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/youlai/boot/mini/controller/StrayAnimalController.java | 2 -- .../youlai/boot/mini/controller/UnauthenticatedController.java | 1 - 2 files changed, 3 deletions(-) diff --git a/src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java b/src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java index 56e01de..15d0d04 100644 --- a/src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java +++ b/src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java @@ -116,7 +116,6 @@ public class StrayAnimalController { @Operation(summary = "获取自己登记创建的动物信息列表") @GetMapping(value = "/getSelfCreatedPage") - @Log(module = LogModuleEnum.STRAY_ANIMAL_INFO, value = ActionTypeEnum.LIST) public PageResult getSelfCreatedPage( OwnStrayAnimalQuery queryParams ) { @@ -134,7 +133,6 @@ public class StrayAnimalController { @Operation(summary = "获取某个用户登记创建的动物信息列表") @GetMapping(value = "/getOthersCreatedPage/{authorUuid}") - @Log(module = LogModuleEnum.STRAY_ANIMAL_INFO, value = ActionTypeEnum.LIST) public PageResult getOthersCreatedPage( @PathVariable String authorUuid, OwnStrayAnimalQuery queryParams diff --git a/src/main/java/com/youlai/boot/mini/controller/UnauthenticatedController.java b/src/main/java/com/youlai/boot/mini/controller/UnauthenticatedController.java index 16fbf95..90416ca 100644 --- a/src/main/java/com/youlai/boot/mini/controller/UnauthenticatedController.java +++ b/src/main/java/com/youlai/boot/mini/controller/UnauthenticatedController.java @@ -48,7 +48,6 @@ public class UnauthenticatedController { @Operation(summary = "获取某个用户登记创建的动物信息列表", operationId = "publicGetOthersCreatedPage") @GetMapping(value = "/strayAnimal/getOthersCreatedPage/{authorUuid}") - @Log(module = LogModuleEnum.STRAY_ANIMAL_INFO, value = ActionTypeEnum.LIST) public PageResult getOthersCreatedPage( @PathVariable String authorUuid, OwnStrayAnimalQuery queryParams From 2c15e1211ea3ee4735fe613cacca1301fd465c34 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Wed, 22 Apr 2026 12:53:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youlai/boot/common/result/PageResult.java | 19 ++++++++++++++----- src/main/resources/application-dev.yml | 6 +++--- 2 files changed, 17 insertions(+), 8 deletions(-) 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 配置