|
@@ -2,6 +2,10 @@ package space.anyi.serve.controller;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import jakarta.annotation.Resource;
|
|
import jakarta.annotation.Resource;
|
|
|
|
|
+import jakarta.validation.Valid;
|
|
|
|
|
+import jakarta.validation.constraints.NotBlank;
|
|
|
|
|
+import jakarta.validation.constraints.NotEmpty;
|
|
|
|
|
+import jakarta.validation.constraints.NotNull;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import space.anyi.serve.entity.PageVo;
|
|
import space.anyi.serve.entity.PageVo;
|
|
@@ -10,6 +14,7 @@ import space.anyi.serve.entity.user.*;
|
|
|
import space.anyi.serve.service.UserService;
|
|
import space.anyi.serve.service.UserService;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -43,8 +48,8 @@ public class UserController {
|
|
|
String username,
|
|
String username,
|
|
|
String role,
|
|
String role,
|
|
|
@RequestParam(defaultValue = "1") Integer enable,
|
|
@RequestParam(defaultValue = "1") Integer enable,
|
|
|
- @RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
|
|
- @RequestParam(defaultValue = "10") Integer pageSize) {
|
|
|
|
|
|
|
+ @NotNull(message = "页码不能为null") @RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
|
|
+ @NotNull(message = "分页大小不能为null")@RequestParam(defaultValue = "10") Integer pageSize) {
|
|
|
User user = new User();
|
|
User user = new User();
|
|
|
user.setAccount(account);
|
|
user.setAccount(account);
|
|
|
user.setUsername(username);
|
|
user.setUsername(username);
|
|
@@ -61,7 +66,7 @@ public class UserController {
|
|
|
* @return 单条数据
|
|
* @return 单条数据
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("{id}")
|
|
@GetMapping("{id}")
|
|
|
- public Response<UserVo> queryById(@PathVariable String id) {
|
|
|
|
|
|
|
+ public Response<UserVo> queryById(@NotBlank(message = "用户ID不能为空") @PathVariable String id) {
|
|
|
User user = this.userService.queryById(Long.valueOf(id));
|
|
User user = this.userService.queryById(Long.valueOf(id));
|
|
|
return Response.ok(UserVo.form(user));
|
|
return Response.ok(UserVo.form(user));
|
|
|
}
|
|
}
|
|
@@ -73,7 +78,7 @@ public class UserController {
|
|
|
* @return 新增结果
|
|
* @return 新增结果
|
|
|
*/
|
|
*/
|
|
|
@PostMapping
|
|
@PostMapping
|
|
|
- public Response<Boolean> add(@RequestBody UserDto userDto) {
|
|
|
|
|
|
|
+ public Response<Boolean> add(@Valid@RequestBody UserDto userDto) {
|
|
|
User user = new User();
|
|
User user = new User();
|
|
|
BeanUtils.copyProperties(userDto,user);
|
|
BeanUtils.copyProperties(userDto,user);
|
|
|
return Response.ok(this.userService.insert(user));
|
|
return Response.ok(this.userService.insert(user));
|
|
@@ -86,7 +91,7 @@ public class UserController {
|
|
|
* @return 编辑结果
|
|
* @return 编辑结果
|
|
|
*/
|
|
*/
|
|
|
@PutMapping
|
|
@PutMapping
|
|
|
- public Response<Boolean> edit(@RequestBody UserDto userDto) {
|
|
|
|
|
|
|
+ public Response<Boolean> edit(@Valid@RequestBody UserDto userDto) {
|
|
|
User user = new User();
|
|
User user = new User();
|
|
|
BeanUtils.copyProperties(userDto,user);
|
|
BeanUtils.copyProperties(userDto,user);
|
|
|
user.setId(Long.valueOf(userDto.getId()));
|
|
user.setId(Long.valueOf(userDto.getId()));
|
|
@@ -100,29 +105,44 @@ public class UserController {
|
|
|
* @return 删除是否成功
|
|
* @return 删除是否成功
|
|
|
*/
|
|
*/
|
|
|
@DeleteMapping
|
|
@DeleteMapping
|
|
|
- public Response<Boolean> deleteById(List<Long> ids) {
|
|
|
|
|
- return Response.ok(this.userService.deleteById(ids));
|
|
|
|
|
|
|
+ public Response<Boolean> deleteById(@NotEmpty(message = "ID列表不能为空") List<String> ids) {
|
|
|
|
|
+ List<Long> list = ids.stream().map(Long::valueOf).toList();
|
|
|
|
|
+ return Response.ok(this.userService.deleteById(list));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //更新用户状态
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 更新用户状态
|
|
|
|
|
+ * @param dto
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
@PutMapping("/updateStatus")
|
|
@PutMapping("/updateStatus")
|
|
|
- public Response updateUserStatus(@RequestBody UpdateUserStatusDto dto){
|
|
|
|
|
|
|
+ public Response updateUserStatus(@Valid@RequestBody UpdateUserStatusDto dto){
|
|
|
User user = new User();
|
|
User user = new User();
|
|
|
BeanUtils.copyProperties(dto,user);
|
|
BeanUtils.copyProperties(dto,user);
|
|
|
user.setId(Long.valueOf(dto.getId()));
|
|
user.setId(Long.valueOf(dto.getId()));
|
|
|
return Response.ok(userService.updateUserStatus(user));
|
|
return Response.ok(userService.updateUserStatus(user));
|
|
|
}
|
|
}
|
|
|
- //更新用户头像
|
|
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 更新用户头像
|
|
|
|
|
+ * @param dto
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
@PutMapping("/updateAvatar")
|
|
@PutMapping("/updateAvatar")
|
|
|
- public Response updateUserAvatar(@RequestBody UpdateUserAvatarDto dto){
|
|
|
|
|
|
|
+ public Response updateUserAvatar(@Valid@RequestBody UpdateUserAvatarDto dto){
|
|
|
User user = new User();
|
|
User user = new User();
|
|
|
BeanUtils.copyProperties(dto,user);
|
|
BeanUtils.copyProperties(dto,user);
|
|
|
user.setId(Long.valueOf(dto.getId()));
|
|
user.setId(Long.valueOf(dto.getId()));
|
|
|
return Response.ok(userService.updateUserAvatar(user));
|
|
return Response.ok(userService.updateUserAvatar(user));
|
|
|
}
|
|
}
|
|
|
- //更新用户密码
|
|
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 更新用户密码
|
|
|
|
|
+ * @param dto
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
@PutMapping("/updatePassword")
|
|
@PutMapping("/updatePassword")
|
|
|
- public Response updatePassword(@RequestBody UpdateUserPasswordDto dto){
|
|
|
|
|
|
|
+ public Response updatePassword(@Valid @RequestBody UpdateUserPasswordDto dto){
|
|
|
User user = new User();
|
|
User user = new User();
|
|
|
BeanUtils.copyProperties(dto,user);
|
|
BeanUtils.copyProperties(dto,user);
|
|
|
user.setId(Long.valueOf(dto.getId()));
|
|
user.setId(Long.valueOf(dto.getId()));
|