|
|
@ -21,18 +21,18 @@ import ${basePackage}.module.system.ent.User;
|
|
|
|
import ${basePackage}.module.system.mpr.UserMapper;
|
|
|
|
import ${basePackage}.module.system.mpr.UserMapper;
|
|
|
|
import ${basePackage}.module.system.req.DeptFindRequest;
|
|
|
|
import ${basePackage}.module.system.req.DeptFindRequest;
|
|
|
|
import ${basePackage}.module.system.req.RoleFindRequest;
|
|
|
|
import ${basePackage}.module.system.req.RoleFindRequest;
|
|
|
|
|
|
|
|
import ${basePackage}.module.system.req.UserChangePwdRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserCreateRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserCreateRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserDeleteRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserDeleteRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserFindRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserFindRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserGetRequest;
|
|
|
|
|
|
|
|
import ${basePackage}.module.system.req.UserRoleCreateRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserRoleCreateRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserUpdateRequest;
|
|
|
|
import ${basePackage}.module.system.req.UserUpdateRequest;
|
|
|
|
import ${basePackage}.module.system.rsp.DeptFindResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.DeptFindResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.RoleFindResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.RoleFindResponse;
|
|
|
|
|
|
|
|
import ${basePackage}.module.system.rsp.UserChangePwdResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserCreateResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserCreateResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserDeleteResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserDeleteResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserFindResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserFindResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserGetResponse;
|
|
|
|
|
|
|
|
import ${basePackage}.module.system.rsp.UserRoleCreateResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserRoleCreateResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserUpdateResponse;
|
|
|
|
import ${basePackage}.module.system.rsp.UserUpdateResponse;
|
|
|
|
|
|
|
|
|
|
|
@ -200,58 +200,69 @@ public class UserManagerImpl implements UserManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 查询
|
|
|
|
* 更新密码
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param request 请求对象
|
|
|
|
* @param request 请求对象
|
|
|
|
* @param token 令牌
|
|
|
|
* @param token 令牌
|
|
|
|
* @return 响应
|
|
|
|
* @return 响应
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Transactional(readOnly = true)
|
|
|
|
public UserChangePwdResponse changePwd(UserChangePwdRequest request, Token token) {
|
|
|
|
public UserFindResponse find(UserFindRequest request, Token token) {
|
|
|
|
UserChangePwdResponse response = new UserChangePwdResponse();
|
|
|
|
UserFindResponse response = new UserFindResponse();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ValidationUtil.validate(request, response);
|
|
|
|
ValidationUtil.validate(request, response);
|
|
|
|
if (response.hasError()) {
|
|
|
|
if (response.hasError()) {
|
|
|
|
return response;
|
|
|
|
return response;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (request.getPageSize() != 0) {
|
|
|
|
User entity = userMapper.getById(LocalData.getToken().getUserId(), token);
|
|
|
|
PageHelper.startPage(request.getPageNumber(), request.getPageSize());
|
|
|
|
if (entity == null) {
|
|
|
|
|
|
|
|
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
|
|
|
|
|
|
|
|
return response;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtil.isNotEmpty(request.getSortKey())) {
|
|
|
|
|
|
|
|
PageHelper.orderBy(request.getSortKey() + " " + request.getSortType());
|
|
|
|
if (!entity.getUserPwd().equals(MD5Util.generatePwd(request.getPassword()))) {
|
|
|
|
|
|
|
|
response.addError(ErrorType.BUSINESS_ERROR, "登录密码错误!");
|
|
|
|
|
|
|
|
return response;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PageInfo<User> pageInfo = new PageInfo<>(userMapper.find(request, token));
|
|
|
|
entity.setUserPwd(MD5Util.generatePwd(request.getNewPassword()));
|
|
|
|
|
|
|
|
|
|
|
|
response.setResult(pageInfo.getList());
|
|
|
|
MapperUtil.map(request, entity);
|
|
|
|
response.setTotalCount(pageInfo.getTotal());
|
|
|
|
long result = userMapper.changePwd(entity, token);
|
|
|
|
|
|
|
|
if (1L != result) {
|
|
|
|
|
|
|
|
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
|
|
|
|
|
|
|
|
return response;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
response.setResult(result);
|
|
|
|
|
|
|
|
|
|
|
|
return response;
|
|
|
|
return response;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 获得对象
|
|
|
|
* 查询
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param request 请求对象
|
|
|
|
* @param request 请求对象
|
|
|
|
* @param token 令牌
|
|
|
|
* @param token 令牌
|
|
|
|
* @return 响应
|
|
|
|
* @return 响应
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Transactional(readOnly = true)
|
|
|
|
@Transactional(readOnly = true)
|
|
|
|
public UserGetResponse get(UserGetRequest request, Token token) {
|
|
|
|
public UserFindResponse find(UserFindRequest request, Token token) {
|
|
|
|
UserGetResponse response = new UserGetResponse();
|
|
|
|
UserFindResponse response = new UserFindResponse();
|
|
|
|
|
|
|
|
|
|
|
|
ValidationUtil.validate(request, response);
|
|
|
|
ValidationUtil.validate(request, response);
|
|
|
|
if (response.hasError()) {
|
|
|
|
if (response.hasError()) {
|
|
|
|
return response;
|
|
|
|
return response;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
User po = userMapper.getById(request.getId(), token);
|
|
|
|
if (request.getPageSize() != 0) {
|
|
|
|
|
|
|
|
PageHelper.startPage(request.getPageNumber(), request.getPageSize());
|
|
|
|
if (po != null) {
|
|
|
|
}
|
|
|
|
response.setUser(po);
|
|
|
|
if (StringUtil.isNotEmpty(request.getSortKey())) {
|
|
|
|
} else {
|
|
|
|
PageHelper.orderBy(request.getSortKey() + " " + request.getSortType());
|
|
|
|
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
PageInfo<User> pageInfo = new PageInfo<>(userMapper.find(request, token));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
response.setResult(pageInfo.getList());
|
|
|
|
|
|
|
|
response.setTotalCount(pageInfo.getTotal());
|
|
|
|
|
|
|
|
|
|
|
|
return response;
|
|
|
|
return response;
|
|
|
|
}
|
|
|
|
}
|
|
|
|