# feat:完善用户管理相关的接口和模型

src/main/java/space/anyi/serve/controller/UserController.java

@@ -3,7 +3,6 @@ package space.anyi.serve.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
 import org.springframework.beans.BeanUtils;
-import org.springframework.context.annotation.Bean;
 import org.springframework.web.bind.annotation.*;
 import space.anyi.serve.entity.PageVo;
 import space.anyi.serve.entity.Response;
@@ -39,7 +38,7 @@ public class UserController {
      * @return
      */
     @GetMapping
-    public Response<PageVo<User>> queryByPage(
+    public Response<PageVo<List<UserVo>>> queryByPage(
             String account,
             String username,
             String role,
@@ -52,7 +51,7 @@ public class UserController {
         user.setRole(role);
         user.setEnable(enable);
         Page<User> page = this.userService.queryByPage(user, Page.of(pageNum, pageSize));
-        return Response.ok(PageVo.of(page));
+        return Response.ok(new PageVo<List<UserVo>>(page.getTotal(),UserVo.from(page.getRecords())));
     }
 
     /**
@@ -62,8 +61,9 @@ public class UserController {
      * @return 单条数据
      */
     @GetMapping("{id}")
-    public Response<User> queryById(@PathVariable Long id) {
-        return Response.ok(this.userService.queryById(id));
+    public Response<UserVo> queryById(@PathVariable String id) {
+        User user = this.userService.queryById(Long.valueOf(id));
+        return Response.ok(UserVo.form(user));
     }
 
     /**
@@ -86,9 +86,10 @@ public class UserController {
      * @return 编辑结果
      */
     @PutMapping
-    public Response<Boolean> edit(UserDto userDto) {
+    public Response<Boolean> edit(@RequestBody UserDto userDto) {
         User user = new User();
         BeanUtils.copyProperties(userDto,user);
+        user.setId(Long.valueOf(userDto.getId()));
         return Response.ok(this.userService.update(user));
     }
 
@@ -105,23 +106,26 @@ public class UserController {
 
     //更新用户状态
     @PutMapping("/updateStatus")
-    public Response updateUserStatus(UpdateUserStatusDto dto){
+    public Response updateUserStatus(@RequestBody UpdateUserStatusDto dto){
         User user = new User();
         BeanUtils.copyProperties(dto,user);
+        user.setId(Long.valueOf(dto.getId()));
         return Response.ok(userService.updateUserStatus(user));
     }
     //更新用户头像
     @PutMapping("/updateAvatar")
-    public Response updateUserAvatar(UpdateUserAvatarDto dto){
+    public Response updateUserAvatar(@RequestBody UpdateUserAvatarDto dto){
         User user = new User();
         BeanUtils.copyProperties(dto,user);
+        user.setId(Long.valueOf(dto.getId()));
         return Response.ok(userService.updateUserAvatar(user));
     }
     //更新用户密码
     @PutMapping("/updatePassword")
-    public Response updatePassword(UpdateUserPasswordDto dto){
+    public Response updatePassword(@RequestBody UpdateUserPasswordDto dto){
         User user = new User();
         BeanUtils.copyProperties(dto,user);
+        user.setId(Long.valueOf(dto.getId()));
         return Response.ok(userService.updatePassword(user,dto.getOldPassword()));
     }
 

src/main/java/space/anyi/serve/entity/user/UpdateUserAvatarDto.java

@@ -9,14 +9,14 @@ package space.anyi.serve.entity.user;
  * @description:
  */
 public class UpdateUserAvatarDto {
-    private Long id;
+    private String id;
     private String avatar;
 
-    public Long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Long id) {
+    public void setId(String id) {
         this.id = id;
     }
 

src/main/java/space/anyi/serve/entity/user/UpdateUserPasswordDto.java

@@ -9,15 +9,15 @@ package space.anyi.serve.entity.user;
  * @description:
  */
 public class UpdateUserPasswordDto {
-    private Long id;
+    private String id;
     private String password;
     private String oldPassword;
 
-    public Long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Long id) {
+    public void setId(String id) {
         this.id = id;
     }
 

src/main/java/space/anyi/serve/entity/user/UpdateUserStatusDto.java

@@ -1,5 +1,7 @@
 package space.anyi.serve.entity.user;
 
+import org.springframework.lang.NonNull;
+
 /**
  * @fileName: UpdateUserStatusDto
  * @projectName: serve
@@ -9,14 +11,16 @@ package space.anyi.serve.entity.user;
  * @description:
  */
 public class UpdateUserStatusDto {
-    private Long id;
+    @NonNull
+    private String id;
+    @NonNull
     private Integer enable;
 
-    public Long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Long id) {
+    public void setId(String id) {
         this.id = id;
     }
 

src/main/java/space/anyi/serve/entity/user/UserDto.java

@@ -1,5 +1,7 @@
 package space.anyi.serve.entity.user;
 
+import org.springframework.lang.NonNull;
+
 /**
  * @fileName: UserDto
  * @projectName: serve
@@ -9,17 +11,17 @@ package space.anyi.serve.entity.user;
  * @description:
  */
 public class UserDto {
-    private Long id;
+    private String id;
     private String account;
     private String password;
     private String username;
     private String role;
 
-    public Long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Long id) {
+    public void setId(String id) {
         this.id = id;
     }
 

src/main/java/space/anyi/serve/entity/user/UserVo.java

@@ -1,6 +1,10 @@
 package space.anyi.serve.entity.user;
 
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * @fileName: UserVo
  * @projectName: serve
@@ -10,17 +14,18 @@ package space.anyi.serve.entity.user;
  * @description:
  */
 public class UserVo {
-    private Long id;
+    private String id;
     private String account;
     private String username;
     private String role;
     private String avatar;
+    private Integer enable = 1;
 
-    public Long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Long id) {
+    public void setId(String id) {
         this.id = id;
     }
 
@@ -55,4 +60,32 @@ public class UserVo {
     public void setAvatar(String avatar) {
         this.avatar = avatar;
     }
+
+    public Integer getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Integer enable) {
+        this.enable = enable;
+    }
+    public static UserVo form(User user){
+        UserVo vo = new UserVo();
+        if (Objects.isNull(user)) {
+            return vo;
+        }
+        vo.setId(user.getId()+"");
+        vo.setAccount(user.getAccount());
+        vo.setUsername(user.getUsername());
+        vo.setRole(user.getRole());
+        vo.setAvatar(user.getAvatar());
+        vo.setEnable(user.getEnable());
+        return vo;
+    }
+    public static List<UserVo> from(List<User> list){
+        List<UserVo> res = new ArrayList<>();
+        for (User user : list) {
+            res.add(UserVo.form(user));
+        }
+        return res;
+    }
 }