|
@@ -3,15 +3,15 @@ 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 org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
|
+import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-import space.anyi.serve.entity.PageDto;
|
|
|
|
|
import space.anyi.serve.entity.PageVo;
|
|
import space.anyi.serve.entity.PageVo;
|
|
|
import space.anyi.serve.entity.Response;
|
|
import space.anyi.serve.entity.Response;
|
|
|
-import space.anyi.serve.entity.user.User;
|
|
|
|
|
-import space.anyi.serve.entity.user.UserDto;
|
|
|
|
|
-import space.anyi.serve.entity.user.UserQueryCondition;
|
|
|
|
|
|
|
+import space.anyi.serve.entity.user.*;
|
|
|
import space.anyi.serve.service.UserService;
|
|
import space.anyi.serve.service.UserService;
|
|
|
|
|
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* (User)表控制层
|
|
* (User)表控制层
|
|
@@ -30,16 +30,28 @@ public class UserController {
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 分页查询
|
|
* 分页查询
|
|
|
- *
|
|
|
|
|
- * @param pageDto 条件分页
|
|
|
|
|
- * @return 查询结果
|
|
|
|
|
|
|
+ * @param account
|
|
|
|
|
+ * @param username
|
|
|
|
|
+ * @param role
|
|
|
|
|
+ * @param enable
|
|
|
|
|
+ * @param pageNum
|
|
|
|
|
+ * @param pageSize
|
|
|
|
|
+ * @return
|
|
|
*/
|
|
*/
|
|
|
@GetMapping
|
|
@GetMapping
|
|
|
- public Response<PageVo<User>> queryByPage(UserQueryCondition userQueryCondition,PageDto pageDto) {
|
|
|
|
|
|
|
+ public Response<PageVo<User>> queryByPage(
|
|
|
|
|
+ String account,
|
|
|
|
|
+ String username,
|
|
|
|
|
+ String role,
|
|
|
|
|
+ @RequestParam(defaultValue = "1") Integer enable,
|
|
|
|
|
+ @RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
|
|
+ @RequestParam(defaultValue = "10") Integer pageSize) {
|
|
|
User user = new User();
|
|
User user = new User();
|
|
|
- BeanUtils.copyProperties(userQueryCondition,user);
|
|
|
|
|
- //PageRequest pageRequest = PageRequest.of(pageDto.getPageNum(), pageDto.getPageSize());
|
|
|
|
|
- Page<User> page = this.userService.queryByPage(user, Page.of(pageDto.getPageNum(), pageDto.getPageSize()));
|
|
|
|
|
|
|
+ user.setAccount(account);
|
|
|
|
|
+ user.setUsername(username);
|
|
|
|
|
+ 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(PageVo.of(page));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -61,7 +73,7 @@ public class UserController {
|
|
|
* @return 新增结果
|
|
* @return 新增结果
|
|
|
*/
|
|
*/
|
|
|
@PostMapping
|
|
@PostMapping
|
|
|
- public Response<User> add(@RequestBody UserDto userDto) {
|
|
|
|
|
|
|
+ public Response<Boolean> add(@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));
|
|
@@ -74,7 +86,7 @@ public class UserController {
|
|
|
* @return 编辑结果
|
|
* @return 编辑结果
|
|
|
*/
|
|
*/
|
|
|
@PutMapping
|
|
@PutMapping
|
|
|
- public Response<User> edit(UserDto userDto) {
|
|
|
|
|
|
|
+ public Response<Boolean> edit(UserDto userDto) {
|
|
|
User user = new User();
|
|
User user = new User();
|
|
|
BeanUtils.copyProperties(userDto,user);
|
|
BeanUtils.copyProperties(userDto,user);
|
|
|
return Response.ok(this.userService.update(user));
|
|
return Response.ok(this.userService.update(user));
|
|
@@ -83,12 +95,34 @@ public class UserController {
|
|
|
/**
|
|
/**
|
|
|
* 删除数据
|
|
* 删除数据
|
|
|
*
|
|
*
|
|
|
- * @param id 主键
|
|
|
|
|
|
|
+ * @param ids 主键
|
|
|
* @return 删除是否成功
|
|
* @return 删除是否成功
|
|
|
*/
|
|
*/
|
|
|
@DeleteMapping
|
|
@DeleteMapping
|
|
|
- public Response<Boolean> deleteById(Long id) {
|
|
|
|
|
- return Response.ok(this.userService.deleteById(id));
|
|
|
|
|
|
|
+ public Response<Boolean> deleteById(List<Long> ids) {
|
|
|
|
|
+ return Response.ok(this.userService.deleteById(ids));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //更新用户状态
|
|
|
|
|
+ @PutMapping("/updateStatus")
|
|
|
|
|
+ public Response updateUserStatus(UpdateUserStatusDto dto){
|
|
|
|
|
+ User user = new User();
|
|
|
|
|
+ BeanUtils.copyProperties(dto,user);
|
|
|
|
|
+ return Response.ok(userService.updateUserStatus(user));
|
|
|
|
|
+ }
|
|
|
|
|
+ //更新用户头像
|
|
|
|
|
+ @PutMapping("/updateAvatar")
|
|
|
|
|
+ public Response updateUserAvatar(UpdateUserAvatarDto dto){
|
|
|
|
|
+ User user = new User();
|
|
|
|
|
+ BeanUtils.copyProperties(dto,user);
|
|
|
|
|
+ return Response.ok(userService.updateUserAvatar(user));
|
|
|
|
|
+ }
|
|
|
|
|
+ //更新用户密码
|
|
|
|
|
+ @PutMapping("/updatePassword")
|
|
|
|
|
+ public Response updatePassword(UpdateUserPasswordDto dto){
|
|
|
|
|
+ User user = new User();
|
|
|
|
|
+ BeanUtils.copyProperties(dto,user);
|
|
|
|
|
+ return Response.ok(userService.updatePassword(user,dto.getOldPassword()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|