From 1c59d3393236590f67bb315dbe16c77368f970d9 Mon Sep 17 00:00:00 2001 From: suyiiyii Date: Fri, 16 Aug 2024 01:17:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=20=E5=AE=8C=E6=88=90User=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sims/controller/UserController.java | 93 +++++-------------- .../top/suyiiyii/sims/dto/CommonResponse.java | 16 ++++ .../java/top/suyiiyii/sims/entity/User.java | 3 +- .../suyiiyii/sims/service/UserService.java | 8 +- 4 files changed, 40 insertions(+), 80 deletions(-) create mode 100644 src/main/java/top/suyiiyii/sims/dto/CommonResponse.java diff --git a/src/main/java/top/suyiiyii/sims/controller/UserController.java b/src/main/java/top/suyiiyii/sims/controller/UserController.java index ac530d4..ce18f52 100644 --- a/src/main/java/top/suyiiyii/sims/controller/UserController.java +++ b/src/main/java/top/suyiiyii/sims/controller/UserController.java @@ -1,12 +1,13 @@ package top.suyiiyii.sims.controller; import cn.hutool.core.util.StrUtil; -import jakarta.validation.constraints.Null; import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import top.suyiiyii.sims.common.AuthAccess; import top.suyiiyii.sims.common.Result; +import top.suyiiyii.sims.dto.CommonResponse; import top.suyiiyii.sims.entity.User; import top.suyiiyii.sims.exception.ServiceException; import top.suyiiyii.sims.service.RoleService; @@ -21,8 +22,10 @@ import top.suyiiyii.sims.service.UserService; * @Description: TODO * @Version 1.0 */ + +@Slf4j @RestController -@RequestMapping("/user") +//@RequestMapping("/user") public class UserController { @Autowired UserService userService; @@ -37,8 +40,9 @@ public class UserController { } - @PostMapping("/login") + @PostMapping("/user/login") public Result login(@RequestBody LoginRequest request) { + log.info("login request:{}", request); if (StrUtil.isBlank(request.getUsername()) || StrUtil.isBlank(request.getPassword())) { @@ -50,8 +54,9 @@ public class UserController { return Result.success(new LoginResponse()); } - @PostMapping("/register") - public Result register(@RequestBody RegisterRequest request) { + @PostMapping("/user/register") + public Result register(@RequestBody RegisterRequest request) { + log.info("register request:{}", request); if (StrUtil.isBlank(request.getUsername()) || StrUtil.isBlank(request.getPassword())) { return Result.error("用户名或密码不能为空"); @@ -62,80 +67,24 @@ public class UserController { userService.register(new User()); - return Result.success(); + return Result.success(CommonResponse.factory("注册成功")); } - @PostMapping("/add") - public Result add(@RequestBody User user) { - userService.addUser(user); - return Result.success(); + @DeleteMapping("/admin/user/{id}") + public Result adminDelete(@PathVariable Integer id) { + log.info("delete request:{}", id); +// userService.deleteUser(user.getId()); + return Result.success(CommonResponse.factory("删除成功")); } - @PostMapping("/delete") - public Result delete(@RequestBody User user) { - userService.deleteUser(user.getId()); - return Result.success("删除成功"); + @GetMapping("/admin/user/{id}") + public Result adminGetById(@PathVariable Integer id) { + log.info("selectById request:{}", id); + User user = userService.selectById(id); + return Result.success(user); } - /** - * @param user - * @author: tortoise - * @date: 2024/8/14 13:34 - * @Description: 更新用户信息, 自己改的(不包括密码) - * @return: top.suyiiyii.sims.common.Result - */ - @PostMapping("/update") - public Result update(@RequestBody User user) { - userService.updateUser(user); - return Result.success("更新成功"); - } - @PostMapping("/select") - public Result select(@RequestBody User user) { - return Result.success(userService.selectById(user.getId())); - } - - @PostMapping("/selectByUsername") - public Result selectByUsername(@RequestBody User user) { - return Result.success(userService.selectByUsername(user.getUsername())); - } - - /** - * @param user - * @author: tortoise - * @date: 2024/8/14 13:48 - * @Description: TODO 用户更新密码 - * @return: top.suyiiyii.sims.common.Result - */ - @PostMapping("/updatePassword") - public Result updatePassword(@RequestBody User user) { - if (StrUtil.isBlank(user.getPassword())) { - return Result.error("密码不能为空"); - } - User user1 = userService.selectByUsername(user.getUsername()); - //验证原密码是否正确 - if (!user.getPassword().equals(user1.getPassword())) { - return Result.error("原密码错误"); - } - userService.updatePassword(user); - return Result.success("更新成功"); - } - - /** - * @param user - * @author: tortoise - * @date: 2024/8/14 13:48 - * @Description: TODO 管理员修改密码 - * @return: top.suyiiyii.sims.common.Result - */ - @PostMapping("/updatePasswordByAdmin") - public Result updatePasswordByAdmin(@RequestBody User user) { - if (StrUtil.isBlank(user.getPassword())) { - return Result.error("密码不能为空"); - } - userService.updatePassword(user); - return Result.success("更新成功"); - } @Data public static class RegisterRequest { diff --git a/src/main/java/top/suyiiyii/sims/dto/CommonResponse.java b/src/main/java/top/suyiiyii/sims/dto/CommonResponse.java new file mode 100644 index 0000000..dac2ea3 --- /dev/null +++ b/src/main/java/top/suyiiyii/sims/dto/CommonResponse.java @@ -0,0 +1,16 @@ +package top.suyiiyii.sims.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@AllArgsConstructor +@NoArgsConstructor +@Data +public class CommonResponse { + String message; + + public static CommonResponse factory(String message) { + return new CommonResponse(message); + } +} diff --git a/src/main/java/top/suyiiyii/sims/entity/User.java b/src/main/java/top/suyiiyii/sims/entity/User.java index 58126ac..6606503 100644 --- a/src/main/java/top/suyiiyii/sims/entity/User.java +++ b/src/main/java/top/suyiiyii/sims/entity/User.java @@ -1,6 +1,5 @@ package top.suyiiyii.sims.entity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.tangzc.mpe.autotable.annotation.Table; @@ -25,7 +24,7 @@ import java.util.Set; public class User { @TableId("id") private Integer id; - private Integer userId; + private Integer studentId; private String username; private String password; private String email; diff --git a/src/main/java/top/suyiiyii/sims/service/UserService.java b/src/main/java/top/suyiiyii/sims/service/UserService.java index d8113f5..0dba25d 100644 --- a/src/main/java/top/suyiiyii/sims/service/UserService.java +++ b/src/main/java/top/suyiiyii/sims/service/UserService.java @@ -6,8 +6,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import top.suyiiyii.sims.VO.UserVO; -import top.suyiiyii.sims.common.Result; -import top.suyiiyii.sims.dto.UserDTO; import top.suyiiyii.sims.entity.*; import top.suyiiyii.sims.exception.ServiceException; import top.suyiiyii.sims.mapper.PermissionsMapper; @@ -16,10 +14,8 @@ import top.suyiiyii.sims.mapper.UserMapper; import top.suyiiyii.sims.utils.JwtUtils; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.function.ToDoubleBiFunction; /** * @Author tortoise @@ -88,7 +84,7 @@ public class UserService { public User register(User user) { - User dbUser = userMapper.selectByUserId(user.getUserId()); + User dbUser = userMapper.selectByUserId(user.getStudentId()); if (user.getUsername() == null || user.getUsername().equals("")) { throw new ServiceException("用户名不能为空"); @@ -96,7 +92,7 @@ public class UserService { if (dbUser != null) { throw new ServiceException("账号已经存在"); } - if (user.getUserId() == null || user.getUserId().equals("")) { + if (user.getStudentId() == null || user.getStudentId().equals("")) { throw new ServiceException("用户id不能为空"); } if( user.getPassword() == null || user.getPassword().equals("")) {