From 9d29b21171e74e3e5dc5ba98be4715c8bdacd38f Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sun, 13 Jul 2025 14:52:24 +0800 Subject: [PATCH] =?UTF-8?q?:bulb:=20=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/spring/step2/controller/UserController.java | 4 ++-- .../{LoginController.java => WebController.java} | 9 +++++++-- .../src/main/java/com/spring/step2/domain/vo/UserVo.java | 6 ------ .../com/spring/step2/domain/vo/result/PageResult.java | 3 +++ .../spring/step2/service/impl/PermissionServiceImpl.java | 1 + .../step2/service/impl/RolePermissionServiceImpl.java | 1 + .../com/spring/step2/service/impl/RoleServiceImpl.java | 1 + .../spring/step2/service/impl/UserRoleServiceImpl.java | 1 + .../com/spring/step2/service/impl/UserServiceImpl.java | 2 ++ 9 files changed, 18 insertions(+), 10 deletions(-) rename spring-security/step-2/src/main/java/com/spring/step2/controller/{LoginController.java => WebController.java} (72%) diff --git a/spring-security/step-2/src/main/java/com/spring/step2/controller/UserController.java b/spring-security/step-2/src/main/java/com/spring/step2/controller/UserController.java index 9035aee..5109987 100644 --- a/spring-security/step-2/src/main/java/com/spring/step2/controller/UserController.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/controller/UserController.java @@ -28,7 +28,7 @@ import java.util.List; */ @Tag(name = "用户基本信息表", description = "用户基本信息表相关接口") @RestController -@RequestMapping("/api/coupon/user") +@RequestMapping("/api/user") @RequiredArgsConstructor public class UserController { @@ -44,7 +44,7 @@ public class UserController { UserDto dto) { Page pageParams = new Page<>(page, limit); PageResult pageResult = userService.getUserPage(pageParams, dto); - return Result.success(pageResult); + return Result.success(pageResult, ResultCodeEnum.LOAD_FINISHED); } @Operation(summary = "添加用户基本信息表", description = "添加用户基本信息表") diff --git a/spring-security/step-2/src/main/java/com/spring/step2/controller/LoginController.java b/spring-security/step-2/src/main/java/com/spring/step2/controller/WebController.java similarity index 72% rename from spring-security/step-2/src/main/java/com/spring/step2/controller/LoginController.java rename to spring-security/step-2/src/main/java/com/spring/step2/controller/WebController.java index 74dc734..ac4a01d 100644 --- a/spring-security/step-2/src/main/java/com/spring/step2/controller/LoginController.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/controller/WebController.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @Controller -public class LoginController { +public class WebController { @GetMapping("") public String indexPage() { @@ -15,4 +15,9 @@ public class LoginController { public String showLoginPage() { return "login"; } -} \ No newline at end of file + + @GetMapping("/user") + public String showUserPage() { + return "user/index"; + } +} diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/UserVo.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/UserVo.java index 8aac1bc..89b85fd 100644 --- a/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/UserVo.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/UserVo.java @@ -19,9 +19,6 @@ public class UserVo { @Schema(name = "username", title = "用户名") private String username; - @Schema(name = "password", title = "密码") - private String password; - @Schema(name = "email", title = "邮箱") private String email; @@ -37,8 +34,5 @@ public class UserVo { @Schema(name = "updateUser", title = "更新用户ID") private Long updateUser; - @Schema(name = "isDeleted", title = "是否被删除") - private Boolean isDeleted; - } diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/PageResult.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/PageResult.java index de47b7e..6769eaa 100644 --- a/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/PageResult.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/PageResult.java @@ -25,6 +25,9 @@ public class PageResult implements Serializable { @Schema(name = "pageSize", title = "每页记录数") private Long pageSize; + @Schema(name = "pages", title = "总分页数") + private Long pages; + @Schema(name = "total", title = "总记录数") private Long total; diff --git a/spring-security/step-2/src/main/java/com/spring/step2/service/impl/PermissionServiceImpl.java b/spring-security/step-2/src/main/java/com/spring/step2/service/impl/PermissionServiceImpl.java index acf93b7..1220b67 100644 --- a/spring-security/step-2/src/main/java/com/spring/step2/service/impl/PermissionServiceImpl.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/service/impl/PermissionServiceImpl.java @@ -46,6 +46,7 @@ public class PermissionServiceImpl extends ServiceImpl impleme .list(page.getRecords()) .pageNo(page.getCurrent()) .pageSize(page.getSize()) + .pages(page.getPages()) .total(page.getTotal()) .build(); } diff --git a/spring-security/step-2/src/main/java/com/spring/step2/service/impl/UserRoleServiceImpl.java b/spring-security/step-2/src/main/java/com/spring/step2/service/impl/UserRoleServiceImpl.java index b971570..58ad1cb 100644 --- a/spring-security/step-2/src/main/java/com/spring/step2/service/impl/UserRoleServiceImpl.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/service/impl/UserRoleServiceImpl.java @@ -46,6 +46,7 @@ public class UserRoleServiceImpl extends ServiceImpl impleme public PageResult getUserPage(Page pageParams, UserDto dto) { IPage page = baseMapper.selectListByPage(pageParams, dto); + return PageResult.builder() .list(page.getRecords()) .pageNo(page.getCurrent()) .pageSize(page.getSize()) + .pages(page.getPages()) .total(page.getTotal()) .build(); }