|
|
|
|
@ -23,15 +23,24 @@ import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.UUID;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 用户管理控制器,提供管理员操作用户的各类接口,如分页查询、编辑用户、修改状态等。
|
|
|
|
|
*/
|
|
|
|
|
@RestController("AdminUserController")
|
|
|
|
|
@RequestMapping(value = "/api/admin/user")
|
|
|
|
|
public class UserController extends BaseApiController {
|
|
|
|
|
|
|
|
|
|
private final UserService userService;
|
|
|
|
|
private final UserEventLogService userEventLogService;
|
|
|
|
|
private final AuthenticationService authenticationService;
|
|
|
|
|
|
|
|
|
|
private final UserService userService; // 用户服务
|
|
|
|
|
private final UserEventLogService userEventLogService; // 用户事件日志服务
|
|
|
|
|
private final AuthenticationService authenticationService; // 认证服务
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 构造器,自动注入所需服务。
|
|
|
|
|
*
|
|
|
|
|
* @param userService 用户服务
|
|
|
|
|
* @param userEventLogService 用户事件日志服务
|
|
|
|
|
* @param authenticationService 认证服务
|
|
|
|
|
*/
|
|
|
|
|
@Autowired
|
|
|
|
|
public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService) {
|
|
|
|
|
this.userService = userService;
|
|
|
|
|
@ -39,113 +48,159 @@ public class UserController extends BaseApiController {
|
|
|
|
|
this.authenticationService = authenticationService;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 分页获取用户列表。
|
|
|
|
|
*
|
|
|
|
|
* @param model 用户分页请求模型
|
|
|
|
|
* @return 分页的用户信息
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
|
|
|
|
|
public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
|
|
|
|
|
PageInfo<User> pageInfo = userService.userPage(model);
|
|
|
|
|
PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d -> UserResponseVM.from(d));
|
|
|
|
|
return RestResponse.ok(page);
|
|
|
|
|
PageInfo<User> pageInfo = userService.userPage(model); // 获取用户分页数据
|
|
|
|
|
PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d -> UserResponseVM.from(d)); // 转换为视图模型
|
|
|
|
|
return RestResponse.ok(page); // 返回分页数据
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 分页获取用户事件日志列表。
|
|
|
|
|
*
|
|
|
|
|
* @param model 用户事件分页请求模型
|
|
|
|
|
* @return 分页的用户事件日志信息
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value = "/event/page/list", method = RequestMethod.POST)
|
|
|
|
|
public RestResponse<PageInfo<UserEventLogVM>> eventPageList(@RequestBody UserEventPageRequestVM model) {
|
|
|
|
|
PageInfo<UserEventLog> pageInfo = userEventLogService.page(model);
|
|
|
|
|
PageInfo<UserEventLog> pageInfo = userEventLogService.page(model); // 获取用户事件日志分页数据
|
|
|
|
|
PageInfo<UserEventLogVM> page = PageInfoHelper.copyMap(pageInfo, d -> {
|
|
|
|
|
UserEventLogVM vm = modelMapper.map(d, UserEventLogVM.class);
|
|
|
|
|
vm.setCreateTime(DateTimeUtil.dateFormat(d.getCreateTime()));
|
|
|
|
|
vm.setCreateTime(DateTimeUtil.dateFormat(d.getCreateTime())); // 格式化时间
|
|
|
|
|
return vm;
|
|
|
|
|
});
|
|
|
|
|
return RestResponse.ok(page);
|
|
|
|
|
return RestResponse.ok(page); // 返回分页数据
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 根据用户ID获取用户详情。
|
|
|
|
|
*
|
|
|
|
|
* @param id 用户ID
|
|
|
|
|
* @return 用户信息
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
|
|
|
|
|
public RestResponse<UserResponseVM> select(@PathVariable Integer id) {
|
|
|
|
|
User user = userService.getUserById(id);
|
|
|
|
|
UserResponseVM userVm = UserResponseVM.from(user);
|
|
|
|
|
return RestResponse.ok(userVm);
|
|
|
|
|
User user = userService.getUserById(id); // 获取用户信息
|
|
|
|
|
UserResponseVM userVm = UserResponseVM.from(user); // 转换为视图模型
|
|
|
|
|
return RestResponse.ok(userVm); // 返回用户信息
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取当前登录用户信息。
|
|
|
|
|
*
|
|
|
|
|
* @return 当前登录用户信息
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value = "/current", method = RequestMethod.POST)
|
|
|
|
|
public RestResponse<UserResponseVM> current() {
|
|
|
|
|
User user = getCurrentUser();
|
|
|
|
|
UserResponseVM userVm = UserResponseVM.from(user);
|
|
|
|
|
return RestResponse.ok(userVm);
|
|
|
|
|
User user = getCurrentUser(); // 获取当前登录用户
|
|
|
|
|
UserResponseVM userVm = UserResponseVM.from(user); // 转换为视图模型
|
|
|
|
|
return RestResponse.ok(userVm); // 返回当前用户信息
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 编辑用户信息,支持新增和修改用户。
|
|
|
|
|
*
|
|
|
|
|
* @param model 用户创建或更新模型
|
|
|
|
|
* @return 编辑后的用户信息
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value = "/edit", method = RequestMethod.POST)
|
|
|
|
|
public RestResponse<User> edit(@RequestBody @Valid UserCreateVM model) {
|
|
|
|
|
if (model.getId() == null) { //create
|
|
|
|
|
if (model.getId() == null) { // 新增用户
|
|
|
|
|
User existUser = userService.getUserByUserName(model.getUserName());
|
|
|
|
|
if (null != existUser) {
|
|
|
|
|
return new RestResponse<>(2, "用户已存在");
|
|
|
|
|
return new RestResponse<>(2, "用户已存在"); // 用户名已存在
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isBlank(model.getPassword())) {
|
|
|
|
|
return new RestResponse<>(3, "密码不能为空");
|
|
|
|
|
return new RestResponse<>(3, "密码不能为空"); // 密码不能为空
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isBlank(model.getBirthDay())) {
|
|
|
|
|
model.setBirthDay(null);
|
|
|
|
|
model.setBirthDay(null); // 生日为空时设置为 null
|
|
|
|
|
}
|
|
|
|
|
User user = modelMapper.map(model, User.class);
|
|
|
|
|
User user = modelMapper.map(model, User.class); // 转换为用户实体
|
|
|
|
|
|
|
|
|
|
if (model.getId() == null) {
|
|
|
|
|
String encodePwd = authenticationService.pwdEncode(model.getPassword());
|
|
|
|
|
if (model.getId() == null) { // 新增用户时加密密码并设置其他默认值
|
|
|
|
|
String encodePwd = authenticationService.pwdEncode(model.getPassword()); // 密码加密
|
|
|
|
|
user.setPassword(encodePwd);
|
|
|
|
|
user.setUserUuid(UUID.randomUUID().toString());
|
|
|
|
|
user.setCreateTime(new Date());
|
|
|
|
|
user.setLastActiveTime(new Date());
|
|
|
|
|
user.setDeleted(false);
|
|
|
|
|
userService.insertByFilter(user);
|
|
|
|
|
} else {
|
|
|
|
|
userService.insertByFilter(user); // 插入新用户
|
|
|
|
|
} else { // 修改用户时更新信息
|
|
|
|
|
if (!StringUtils.isBlank(model.getPassword())) {
|
|
|
|
|
String encodePwd = authenticationService.pwdEncode(model.getPassword());
|
|
|
|
|
String encodePwd = authenticationService.pwdEncode(model.getPassword()); // 密码加密
|
|
|
|
|
user.setPassword(encodePwd);
|
|
|
|
|
}
|
|
|
|
|
user.setModifyTime(new Date());
|
|
|
|
|
userService.updateByIdFilter(user);
|
|
|
|
|
user.setModifyTime(new Date()); // 设置修改时间
|
|
|
|
|
userService.updateByIdFilter(user); // 更新用户信息
|
|
|
|
|
}
|
|
|
|
|
return RestResponse.ok(user);
|
|
|
|
|
return RestResponse.ok(user); // 返回操作后的用户信息
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 更新当前用户信息。
|
|
|
|
|
*
|
|
|
|
|
* @param model 用户更新模型
|
|
|
|
|
* @return 操作结果
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
|
|
public RestResponse update(@RequestBody @Valid UserUpdateVM model) {
|
|
|
|
|
User user = userService.selectById(getCurrentUser().getId());
|
|
|
|
|
modelMapper.map(model, user);
|
|
|
|
|
user.setModifyTime(new Date());
|
|
|
|
|
userService.updateByIdFilter(user);
|
|
|
|
|
return RestResponse.ok();
|
|
|
|
|
User user = userService.selectById(getCurrentUser().getId()); // 获取当前用户
|
|
|
|
|
modelMapper.map(model, user); // 更新用户信息
|
|
|
|
|
user.setModifyTime(new Date()); // 设置修改时间
|
|
|
|
|
userService.updateByIdFilter(user); // 更新用户
|
|
|
|
|
return RestResponse.ok(); // 返回成功响应
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 修改用户状态(启用/禁用)。
|
|
|
|
|
*
|
|
|
|
|
* @param id 用户ID
|
|
|
|
|
* @return 更新后的状态
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value = "/changeStatus/{id}", method = RequestMethod.POST)
|
|
|
|
|
public RestResponse<Integer> changeStatus(@PathVariable Integer id) {
|
|
|
|
|
User user = userService.getUserById(id);
|
|
|
|
|
User user = userService.getUserById(id); // 获取用户信息
|
|
|
|
|
UserStatusEnum userStatusEnum = UserStatusEnum.fromCode(user.getStatus());
|
|
|
|
|
Integer newStatus = userStatusEnum == UserStatusEnum.Enable ? UserStatusEnum.Disable.getCode() : UserStatusEnum.Enable.getCode();
|
|
|
|
|
Integer newStatus = userStatusEnum == UserStatusEnum.Enable ? UserStatusEnum.Disable.getCode() : UserStatusEnum.Enable.getCode(); // 切换状态
|
|
|
|
|
user.setStatus(newStatus);
|
|
|
|
|
user.setModifyTime(new Date());
|
|
|
|
|
userService.updateByIdFilter(user);
|
|
|
|
|
return RestResponse.ok(newStatus);
|
|
|
|
|
user.setModifyTime(new Date()); // 设置修改时间
|
|
|
|
|
userService.updateByIdFilter(user); // 更新用户状态
|
|
|
|
|
return RestResponse.ok(newStatus); // 返回新状态
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 删除用户(标记为删除)。
|
|
|
|
|
*
|
|
|
|
|
* @param id 用户ID
|
|
|
|
|
* @return 操作结果
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
|
|
|
|
|
public RestResponse delete(@PathVariable Integer id) {
|
|
|
|
|
User user = userService.getUserById(id);
|
|
|
|
|
user.setDeleted(true);
|
|
|
|
|
userService.updateByIdFilter(user);
|
|
|
|
|
return RestResponse.ok();
|
|
|
|
|
User user = userService.getUserById(id); // 获取用户信息
|
|
|
|
|
user.setDeleted(true); // 标记为已删除
|
|
|
|
|
userService.updateByIdFilter(user); // 更新用户状态
|
|
|
|
|
return RestResponse.ok(); // 返回成功响应
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 根据用户名查找用户。
|
|
|
|
|
*
|
|
|
|
|
* @param userName 用户名
|
|
|
|
|
* @return 用户列表
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value = "/selectByUserName", method = RequestMethod.POST)
|
|
|
|
|
public RestResponse<List<KeyValue>> selectByUserName(@RequestBody String userName) {
|
|
|
|
|
List<KeyValue> keyValues = userService.selectByUserName(userName);
|
|
|
|
|
return RestResponse.ok(keyValues);
|
|
|
|
|
List<KeyValue> keyValues = userService.selectByUserName(userName); // 查找用户名
|
|
|
|
|
return RestResponse.ok(keyValues); // 返回用户名匹配的结果
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|