Commit 1898c2b4 authored by cq990612's avatar cq990612

优化代码结构

parent a2aa9418
...@@ -59,5 +59,5 @@ public interface WorkUserService { ...@@ -59,5 +59,5 @@ public interface WorkUserService {
Boolean modifyRole(Integer userId, List<Integer> roleIds,Integer status); Boolean modifyRole(Integer userId, List<Integer> roleIds,Integer status);
Boolean reSetPassword(Integer userId);
} }
...@@ -806,7 +806,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -806,7 +806,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
List<WorkUser> workUsers = workUserMapper.selectList(new QueryWrapper<>()); List<WorkUser> workUsers = workUserMapper.selectList(new QueryWrapper<>());
List<WorkProject> workProjects = workProjectMapper.selectList(new QueryWrapper<>()); List<WorkProject> workProjects = workProjectMapper.selectList(new QueryWrapper<>());
for (WorkTimeOrder workTimeOrder : workTimeOrders) { for (WorkTimeOrder workTimeOrder : workTimeOrders) {
WorkTimeOrderDto workTimeOrderDto = new WorkTimeOrderDto(); WorkTimeOrderDto workTimeOrderDto = new WorkTimeOrderDto();
BeanUtils.copyProperties(workTimeOrder, workTimeOrderDto); BeanUtils.copyProperties(workTimeOrder, workTimeOrderDto);
......
...@@ -151,7 +151,7 @@ public class WorkUserServiceImpl implements WorkUserService { ...@@ -151,7 +151,7 @@ public class WorkUserServiceImpl implements WorkUserService {
List<WorkUser> users = workUserRoleMapper.getUserRoleDeptDtoByRoleId(1); List<WorkUser> users = workUserRoleMapper.getUserRoleDeptDtoByRoleId(1);
if (!CollectionUtils.isEmpty(users)) { if (!CollectionUtils.isEmpty(users)) {
List<OrganizationStructureDto> allDeptByAllCentre = workDeptService.getAllDeptByAllCentreId(); List<OrganizationStructureDto> allDeptByAllCentre = workDeptService.getAllDeptByAllCentreId();
UserDto userDto1 ; UserDto userDto1;
for (OrganizationStructureDto organizationStructureDto : allDeptByAllCentre) { for (OrganizationStructureDto organizationStructureDto : allDeptByAllCentre) {
List<DeptUserDto> deptUserDtos = organizationStructureDto.getDeptUserDtos(); List<DeptUserDto> deptUserDtos = organizationStructureDto.getDeptUserDtos();
for (DeptUserDto deptUserDto : deptUserDtos) { for (DeptUserDto deptUserDto : deptUserDtos) {
...@@ -171,18 +171,16 @@ public class WorkUserServiceImpl implements WorkUserService { ...@@ -171,18 +171,16 @@ public class WorkUserServiceImpl implements WorkUserService {
} }
@Override @Override
public AllRoleAndUserRoleDto getUserRoleDto(Integer userId, Integer page, Integer pageSize,Integer status,String key) { public AllRoleAndUserRoleDto getUserRoleDto(Integer userId, Integer page, Integer pageSize, Integer status, String key) {
log.info("WorkUserServiceImpl[]getUserRoleDto[]input.param.userId:{},page:{},pageSize:{},status:{},key:{}" + userId, page, pageSize,status,key); log.info("WorkUserServiceImpl[]getUserRoleDto[]input.param.userId:{},page:{},pageSize:{},status:{},key:{}" + userId, page, pageSize, status, key);
if (!UserRoleLevelUtils.isManagerLevel(userId, LevelEnum.ACCOUNTMANAGEMENT.getLevelName())) { if (!UserRoleLevelUtils.isManagerLevel(userId, LevelEnum.ACCOUNTMANAGEMENT.getLevelName())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN); throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
} }
page = page == null ? 1 : page; page = page == null ? 1 : page;
pageSize = pageSize == null ? 10 : pageSize; pageSize = pageSize == null ? 10 : pageSize;
Page<UserRoleDto> startPage = PageHelper.startPage(page, pageSize); Page<UserRoleDto> startPage = PageHelper.startPage(page, pageSize);
List<UserRoleDto> userRoleDtos = workUserMapper.getUserRoleDto(status,key); List<UserRoleDto> userRoleDtos = workUserMapper.getUserRoleDto(status, key);
if (CollectionUtils.isEmpty(userRoleDtos)) { if (CollectionUtils.isEmpty(userRoleDtos)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_DATA_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_DATA_IS_NULL);
} }
...@@ -210,8 +208,8 @@ public class WorkUserServiceImpl implements WorkUserService { ...@@ -210,8 +208,8 @@ public class WorkUserServiceImpl implements WorkUserService {
@Transactional @Transactional
@Override @Override
public Boolean modifyRole(Integer userId, List<Integer> roleIds,Integer status) { public Boolean modifyRole(Integer userId, List<Integer> roleIds, Integer status) {
log.info("WorkUserServiceImpl[]modifyRole[].input.param.userId:{},roleIds:{},status:{}" + userId, roleIds,status); log.info("WorkUserServiceImpl[]modifyRole[].input.param.userId:{},roleIds:{},status:{}" + userId, roleIds, status);
PageHelper.clearPage(); PageHelper.clearPage();
if (UserRoleLevelUtils.levelIsRepeat(roleIds)) { if (UserRoleLevelUtils.levelIsRepeat(roleIds)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEROLEPERMISSIONS); throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEROLEPERMISSIONS);
...@@ -261,7 +259,7 @@ public class WorkUserServiceImpl implements WorkUserService { ...@@ -261,7 +259,7 @@ public class WorkUserServiceImpl implements WorkUserService {
for (Integer roleId : roleIds) { for (Integer roleId : roleIds) {
// 设置部门经理 // 设置部门经理
if (2 == roleId) { if (2 == roleId) {
if (0 == DeptUpdateIndex && null !=workDept.getDeptManagerId()) { if (0 == DeptUpdateIndex && null != workDept.getDeptManagerId()) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.DEPARTMENT_MANAGER_ALREADY_EXISTS); throw new BaseCustomException(BASE_RESP_CODE_ENUM.DEPARTMENT_MANAGER_ALREADY_EXISTS);
} }
workDept.setDeptManagerId(userId); workDept.setDeptManagerId(userId);
...@@ -269,7 +267,7 @@ public class WorkUserServiceImpl implements WorkUserService { ...@@ -269,7 +267,7 @@ public class WorkUserServiceImpl implements WorkUserService {
} }
// 设置中心管理员 // 设置中心管理员
if (3 == roleId) { if (3 == roleId) {
if (0 == centreUpdateIndex && null !=centre.getCentreManagerId()) { if (0 == centreUpdateIndex && null != centre.getCentreManagerId()) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.CENTERMANAGERALREADYEXISTS); throw new BaseCustomException(BASE_RESP_CODE_ENUM.CENTERMANAGERALREADYEXISTS);
} }
centre.setCentreManagerId(userId); centre.setCentreManagerId(userId);
...@@ -280,6 +278,24 @@ public class WorkUserServiceImpl implements WorkUserService { ...@@ -280,6 +278,24 @@ public class WorkUserServiceImpl implements WorkUserService {
return true; return true;
} }
@Override
public Boolean reSetPassword(Integer userId) {
log.info("WorkUserServiceImpl[]reSetPassword[].input.userId" + userId);
if (null == userId) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
// 验证用户是否存在
WorkUser user = workUserMapper.getUserById(userId);
WorkUser workUser = new WorkUser();
workUser.setId(userId);
if (null == user) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_USER_INFO_FAIL);
}
workUser.setPassword(Md5Util.digestMD5(user.getPhone()));
int i = workUserMapper.updateById(workUser);
return i>0;
}
@Override @Override
public ResultUser login(String loginName, String password, String source) { public ResultUser login(String loginName, String password, String source) {
log.info("WorkUserServiceImpl[]login[].input.param" + loginName + password + source); log.info("WorkUserServiceImpl[]login[].input.param" + loginName + password + source);
......
...@@ -138,4 +138,14 @@ public class SystemController extends BaseController { ...@@ -138,4 +138,14 @@ public class SystemController extends BaseController {
return getResult(aBoolean); return getResult(aBoolean);
} }
@ApiOperation(value = "重置用户密码", notes = "重置用户密码", httpMethod = "GET")
@ApiImplicitParam(name = "userId",value = "用户id",dataType ="int", required = true)
@GetMapping("/reSetUserPassword")
public Result<Boolean> reSetUserPassword(Integer userId) {
log.info("SystemController[]reSetUserPassword[]input.param.userId:{}" + userId);
Boolean aBoolean = workUserService.reSetPassword(userId);
return getResult(aBoolean);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment