refactor(user): 简化控制器和实体类并调整注释格式

- 合并登录和注册请求模型,统一参数处理- 删除未使用的字段和导入语句,优化代码
-调整方法注释格式,提升可读性和一致性
- 实体类 `User` 移除 `name` 字段,避免冗余

BREAKING CHANGE: `User` 实体类移除 `name` 字段,可能影响依赖此字段的数据库查询。请确保更新相关代码以适应这一变更。
This commit is contained in:
suyiiyii 2024-08-16 00:57:26 +08:00
parent c8ea250769
commit 2cf298759c
3 changed files with 59 additions and 47 deletions

View File

@ -46,3 +46,4 @@ public class AdminController {
return Result.success(userList); return Result.success(userList);
} }
} }
**/

View File

@ -1,6 +1,7 @@
package top.suyiiyii.sims.controller; package top.suyiiyii.sims.controller;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import jakarta.validation.constraints.Null;
import lombok.Data; import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -11,8 +12,6 @@ import top.suyiiyii.sims.exception.ServiceException;
import top.suyiiyii.sims.service.RoleService; import top.suyiiyii.sims.service.RoleService;
import top.suyiiyii.sims.service.UserService; import top.suyiiyii.sims.service.UserService;
import java.util.List;
/** /**
* @Author tortoise * @Author tortoise
@ -29,71 +28,60 @@ public class UserController {
UserService userService; UserService userService;
@Autowired @Autowired
RoleService roleService; RoleService roleService;
@AuthAccess
@AuthAccess
@GetMapping("/") @GetMapping("/")
public Result hello(){ public Result hello() {
return Result.success("success"); return Result.success("success");
} }
@PostMapping("/login") @PostMapping("/login")
public Result login(LoginRequest request){ public Result<LoginResponse> login(@RequestBody LoginRequest request) {
if(StrUtil.isBlank(request.getUsername())||StrUtil.isBlank(request.getPassword())){ if (StrUtil.isBlank(request.getUsername()) || StrUtil.isBlank(request.getPassword())) {
return Result.error("用户名或密码不能为空"); return Result.error("用户名或密码不能为空");
} }
User user = userService.login(request.getUsername(), request.getPassword()); User user = userService.login(request.getUsername(), request.getPassword());
return Result.success(user); return Result.success(new LoginResponse());
}
@Data
public static class LoginRequest{
public String username;
public String password;
}
@Data
public static class LoginResponse{
public String token;
} }
@PostMapping("/register") @PostMapping("/register")
public Result register(@RequestBody User user){ public Result<Null> register(@RequestBody RegisterRequest request) {
if(StrUtil.isBlank(user.getUsername())||StrUtil.isBlank(user.getPassword())){ if (StrUtil.isBlank(request.getUsername()) || StrUtil.isBlank(request.getPassword())) {
return Result.error("用户名或密码不能为空"); return Result.error("用户名或密码不能为空");
} }
if(user.getPassword() == null || user.getPassword().length() < 3) { if (request.getPassword() == null || request.getPassword().length() < 3) {
throw new ServiceException("密码长度不能小于3位"); throw new ServiceException("密码长度不能小于3位");
} }
user =userService.register(user); userService.register(new User());
return Result.success(user); return Result.success();
} }
@PostMapping("/add") @PostMapping("/add")
public Result add(@RequestBody User user) { public Result add(@RequestBody User user) {
userService.addUser(user); userService.addUser(user);
return Result.success(); return Result.success();
} }
@PostMapping("/delete") @PostMapping("/delete")
public Result delete(@RequestBody User user) { public Result delete(@RequestBody User user) {
userService.deleteUser(user.getId()); userService.deleteUser(user.getId());
return Result.success("删除成功"); return Result.success("删除成功");
} }
/** /**
* @param user
* @author: tortoise * @author: tortoise
* @date: 2024/8/14 13:34 * @date: 2024/8/14 13:34
* @Description: 更新用户信息,自己改的(不包括密码) * @Description: 更新用户信息, 自己改的(不包括密码)
* @param user
* @return: top.suyiiyii.sims.common.Result * @return: top.suyiiyii.sims.common.Result
*/ */
@PostMapping("/update") @PostMapping("/update")
@ -101,48 +89,72 @@ public class UserController {
userService.updateUser(user); userService.updateUser(user);
return Result.success("更新成功"); return Result.success("更新成功");
} }
@PostMapping("/select") @PostMapping("/select")
public Result select(@RequestBody User user) { public Result select(@RequestBody User user) {
return Result.success(userService.selectById(user.getId())); return Result.success(userService.selectById(user.getId()));
} }
@PostMapping("/selectByUsername") @PostMapping("/selectByUsername")
public Result selectByUsername(@RequestBody User user) { public Result selectByUsername(@RequestBody User user) {
return Result.success(userService.selectByUsername(user.getUsername())); return Result.success(userService.selectByUsername(user.getUsername()));
} }
/**
* @author: tortoise /**
* @date: 2024/8/14 13:48 * @param user
* @Description: TODO 用户更新密码 * @author: tortoise
* @param user * @date: 2024/8/14 13:48
* @return: top.suyiiyii.sims.common.Result * @Description: TODO 用户更新密码
*/ * @return: top.suyiiyii.sims.common.Result
*/
@PostMapping("/updatePassword") @PostMapping("/updatePassword")
public Result updatePassword(@RequestBody User user) { public Result updatePassword(@RequestBody User user) {
if(StrUtil.isBlank(user.getPassword())){ if (StrUtil.isBlank(user.getPassword())) {
return Result.error("密码不能为空"); return Result.error("密码不能为空");
} }
User user1 = userService.selectByUsername(user.getUsername()); User user1 = userService.selectByUsername(user.getUsername());
//验证原密码是否正确 //验证原密码是否正确
if(!user.getPassword().equals(user1.getPassword())){ if (!user.getPassword().equals(user1.getPassword())) {
return Result.error("原密码错误"); return Result.error("原密码错误");
} }
userService.updatePassword(user); userService.updatePassword(user);
return Result.success("更新成功"); return Result.success("更新成功");
} }
/**
* @author: tortoise /**
* @date: 2024/8/14 13:48 * @param user
* @Description: TODO 管理员修改密码 * @author: tortoise
* @param user * @date: 2024/8/14 13:48
* @return: top.suyiiyii.sims.common.Result * @Description: TODO 管理员修改密码
*/ * @return: top.suyiiyii.sims.common.Result
*/
@PostMapping("/updatePasswordByAdmin") @PostMapping("/updatePasswordByAdmin")
public Result updatePasswordByAdmin(@RequestBody User user) { public Result updatePasswordByAdmin(@RequestBody User user) {
if(StrUtil.isBlank(user.getPassword())){ if (StrUtil.isBlank(user.getPassword())) {
return Result.error("密码不能为空"); return Result.error("密码不能为空");
} }
userService.updatePassword(user); userService.updatePassword(user);
return Result.success("更新成功"); return Result.success("更新成功");
} }
@Data
public static class RegisterRequest {
private String username;
private String password;
private String email;
private String grade;
private String group;
}
@Data
public static class LoginRequest {
public String username;
public String password;
}
@Data
public static class LoginResponse {
public String token;
}
} }

View File

@ -28,7 +28,6 @@ public class User {
private Integer userId; private Integer userId;
private String username; private String username;
private String password; private String password;
private String name;
private String email; private String email;
private String grade; private String grade;
private String group; private String group;