diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index 26d2be8..0fcd874 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -13,6 +13,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.enums.ZhiChenEnums; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AccessPermissionFacade; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.operate.web.session.SessionProvider; import com.lyms.platform.operate.web.session.strategy.ISessionProvider; @@ -21,6 +22,8 @@ import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.DataPermissionsModel; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.*; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; @@ -69,15 +72,17 @@ public class UsersController extends BaseController { private AccessPermissionFacade accessPermissionFacade; @Autowired private SessionProvider iSessionProvider; + @Autowired + private AutoMatchFacade autoMatchFacade; private static final String LYMS = "龙源美生"; - private static final String ADMIN="管理员"; - private static final String replacePwd = "[$#&/]-+"; + private static final String ADMIN = "管理员"; + private static final String replacePwd = "[$#&/]-+"; @RequestMapping(value = "/rebuildUserRoles", method = RequestMethod.GET) @ResponseBody - public String rebuildUserRoles(@RequestParam(value = "hospitalId")Integer hospitalId) { + public String rebuildUserRoles(@RequestParam(value = "hospitalId") Integer hospitalId) { StringBuffer sb = new StringBuffer(); Organization organization = organizationService.getOrganization(hospitalId); if (organization != null) { @@ -88,11 +93,11 @@ public class UsersController extends BaseController { rolesQuery.setOrgIds(orgids); List rolesList = rolesService.queryRoles(rolesQuery); if (rolesList == null || rolesList.size() == 0) { - sb.append("机构下权限不存在："+hospitalId); + sb.append("机构下权限不存在：" + hospitalId); } else { - Map rolesMap = new HashMap<>(); - for (Roles r:rolesList) { - rolesMap.put(Integer.valueOf(r.getRemarks().split("_")[1 ]), r); + Map rolesMap = new HashMap<>(); + for (Roles r : rolesList) { + rolesMap.put(Integer.valueOf(r.getRemarks().split("_")[1]), r); } UsersQuery usersQuery = new UsersQuery(); usersQuery.setOrgId(hospitalId); @@ -105,7 +110,7 @@ public class UsersController extends BaseController { for (UserRoleMaps maps : mapsList) { Roles roles = rolesMap.get(maps.getRoleId()); if (roles == null) { - sb.append("
roles is null "+JsonUtil.obj2JsonString(maps)+" -- "+users.getId()); + sb.append("
roles is null " + JsonUtil.obj2JsonString(maps) + " -- " + users.getId()); } else { UserRoleMaps dbmaps = new UserRoleMaps(); dbmaps.setYn(1); @@ -113,13 +118,13 @@ public class UsersController extends BaseController { dbmaps.setUserId(users.getId()); userRoleMapsService.addUserRoleMaps(dbmaps); userRoleMapsService.deleteUserRoleMaps(maps.getId()); - sb.append("
success userid:"+users.getId()+" -- "+JsonUtil.obj2JsonString(dbmaps)+" -- "+JsonUtil.obj2JsonString(maps)); + sb.append("
success userid:" + users.getId() + " -- " + JsonUtil.obj2JsonString(dbmaps) + " -- " + JsonUtil.obj2JsonString(maps)); } } } } } else { - sb.append("机构不存在："+hospitalId); + sb.append("机构不存在：" + hospitalId); } return sb.toString(); } @@ -131,10 +136,10 @@ public class UsersController extends BaseController { @ResponseBody @TokenRequired public FrontEndResult getAdminList(HttpServletResponse response, - @RequestParam(value = "keyword", required = false) String keyword, - @RequestParam(value = "rolesId", required = false) Integer rolesId, - @RequestParam(value = "page", required = false) Integer page, - @RequestParam(value = "limit", required = false) Integer limit) { + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "rolesId", required = false) Integer rolesId, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit) { limit = limit == null ? 10 : limit; page = page == null ? 1 : page; @@ -151,7 +156,7 @@ public class UsersController extends BaseController { List users = usersService.queryUsers2(usersQuery); //设置用户角色信息 - for(Users user : users) { + for (Users user : users) { user.setRoles(this.getUserRoles(user.getId())); user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); List permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(user.getId()); @@ -168,12 +173,12 @@ public class UsersController extends BaseController { return frontEndResult; } - @RequestMapping(value = "/users/enums",method = RequestMethod.GET) + @RequestMapping(value = "/users/enums", method = RequestMethod.GET) @ResponseBody - public Map getEnums(){ - Map map=new HashMap(); - for(ZhiChenEnums zhiChenEnums:ZhiChenEnums.values()){ - map.put(zhiChenEnums.getId(),zhiChenEnums.getName()); + public Map getEnums() { + Map map = new HashMap(); + for (ZhiChenEnums zhiChenEnums : ZhiChenEnums.values()) { + map.put(zhiChenEnums.getId(), zhiChenEnums.getName()); } return map; } @@ -186,42 +191,42 @@ public class UsersController extends BaseController { @ResponseBody public FrontEndResult getPermissions(HttpServletResponse response, HttpServletRequest request, - @RequestParam(value = "keyword", required = false) String keyword, - @RequestParam(value = "rolesId", required = false) Integer rolesId, - @RequestParam(value = "page", required = false) Integer page, - @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "orgId", required = false) Integer orgId, - @RequestParam(value = "deptId", required = false) Integer deptId) { + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "rolesId", required = false) Integer rolesId, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit, + @RequestParam(value = "orgId", required = false) Integer orgId, + @RequestParam(value = "deptId", required = false) Integer deptId) { LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); Users u = usersService.getUsers(loginContext.getId()); List ids = null; - if(u.getType().equals(UserTypeEnum.NORMAL_USER.getId())) { - if(null != u.getOrgId()) { + if (u.getType().equals(UserTypeEnum.NORMAL_USER.getId())) { + if (null != u.getOrgId()) { orgId = u.getOrgId(); } else { FrontEndResult frontEndResult = new FrontEndResult(); - frontEndResult.setPageInfo(new PageInfo(0,0,0,10)); + frontEndResult.setPageInfo(new PageInfo(0, 0, 0, 10)); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - return frontEndResult; + return frontEndResult; } - }else if(u.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { + } else if (u.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { List organizations = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(u.getId())); ids = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(organizations)) { - for(Organization organization : organizations) { + if (CollectionUtils.isNotEmpty(organizations)) { + for (Organization organization : organizations) { ids.add(organization.getId()); } } else { FrontEndResult frontEndResult = new FrontEndResult(); - frontEndResult.setPageInfo(new PageInfo(0,0,0,10)); + frontEndResult.setPageInfo(new PageInfo(0, 0, 0, 10)); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - return frontEndResult; + return frontEndResult; } } - if(null != orgId) { + if (null != orgId) { ids = new ArrayList<>(); ids.add(orgId); } @@ -245,7 +250,7 @@ public class UsersController extends BaseController { List users = usersService.queryUsers2(usersQuery); List organizations = null; //设置用户角色信息 - for(Users user : users) { + for (Users user : users) { organizations = new ArrayList<>(); Organization organization = organizationService.getOrganization(user.getOrgId()); user.setOrganization(organization); @@ -254,7 +259,7 @@ public class UsersController extends BaseController { user.setRoles(this.getUserRoles(user.getId())); user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); - if(null!=user.getZhiChenId()){ + if (null != user.getZhiChenId()) { user.setZhiChen(ZhiChenEnums.getById(user.getZhiChenId())); } List permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(user.getId()); @@ -276,13 +281,13 @@ public class UsersController extends BaseController { } //获取用户角色信息 - private List getUserRoles(Integer userId) { + private List getUserRoles(Integer userId) { UserRoleMapsQuery query = new UserRoleMapsQuery(); query.setUserId(userId); query.setYn(YnEnums.YES.getId()); List userRoleMapses = userRoleMapsService.queryUserRoleMaps(query); List roles = new ArrayList<>(); - for(UserRoleMaps roleMaps : userRoleMapses) { + for (UserRoleMaps roleMaps : userRoleMapses) { roles.add(rolesService.getRoles(roleMaps.getRoleId())); } return roles; @@ -309,37 +314,37 @@ public class UsersController extends BaseController { //code 不为空使用手机登录, password不为空时使用帐号登录 UsersQuery usersQuery = new UsersQuery(); usersQuery.setYn(YnEnums.YES.getId()); - if(null != code) { + if (null != code) { usersQuery.setPhone(account); } - if(null != password) { + if (null != password) { usersQuery.setAccount(account); } List users = usersService.queryUsers(usersQuery); - if(0 == users.size()) { + if (0 == users.size()) { ResultUtils.buildParameterErrorResultAndWrite(response, "该账户不存在"); return; } Users u = users.get(0); - if(!u.getEnable().equals(1)) { + if (!u.getEnable().equals(1)) { ResultUtils.buildParameterErrorResultAndWrite(response, "该账户已被禁用"); return; } - if(null!=u.getOrgId()){ + if (null != u.getOrgId()) { Organization organization = organizationService.getOrganization(u.getOrgId()); - if(null!=organization){ - if(null!=organization.getStatus() && HospitalStatusEnums.TZYX.getId()==organization.getStatus()){ - ResultUtils.buildParameterErrorResultAndWrite(response, "该账户已被禁用"); - return; - } + if (null != organization) { + if (null != organization.getStatus() && HospitalStatusEnums.TZYX.getId() == organization.getStatus()) { + ResultUtils.buildParameterErrorResultAndWrite(response, "该账户已被禁用"); + return; + } } } LoginContext loginContext = new LoginContext(); loginContext.setErrormsg("服务器内部错误！"); - loginContext= iSessionProvider.login(account,password,code); + loginContext = iSessionProvider.login(account, password, code); /* if(null != code) { loginContext =LoginUtil.loginByPhone(account, code, typeId, token); } @@ -347,7 +352,7 @@ public class UsersController extends BaseController { loginContext = LoginUtil.loginByAccount(account, password, typeId, token); }*/ - if(null != loginContext && loginContext.getErrorcode().equals(0)) { + if (null != loginContext && loginContext.getErrorcode().equals(0)) { if (u.getLastLoginTime() != null) { Users users1 = new Users(); users1.setId(u.getId()); @@ -358,7 +363,7 @@ public class UsersController extends BaseController { Map result = new HashMap<>(); result.put("token", loginContext.getToken()); ResultUtils.buildSuccessResultAndWrite(response, result); - }else { + } else { ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.PARAMETER_ERROR, loginContext.getErrormsg()); } } @@ -376,7 +381,7 @@ public class UsersController extends BaseController { ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse); return; } - if(!phone.matches("^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\\d{8})$")) { + if (!phone.matches("^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\\d{8})$")) { ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "手机号不正确！"); return; } @@ -385,18 +390,18 @@ public class UsersController extends BaseController { usersQuery.setPhone(phone); usersQuery.setYn(YnEnums.YES.getId()); List list = usersService.queryUsers(usersQuery); - if(null == list || 0 == list.size()) { + if (null == list || 0 == list.size()) { ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户不存在"); return; } - if(!list.get(0).getEnable().equals(1)) { + if (!list.get(0).getEnable().equals(1)) { ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户已被禁用"); return; } LoginContext loginContext = LoginUtil.sendVerCode(phone, typeId, token); - if(null != loginContext) { + if (null != loginContext) { ResultUtils.buildResultAndWrite(httpServletResponse, loginContext.getErrorcode(), loginContext.getErrormsg()); return; } @@ -413,14 +418,14 @@ public class UsersController extends BaseController { public void usersLoginMsg(HttpServletResponse response, HttpServletRequest request) { LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); Users users = null; - if(null != loginContext) { + if (null != loginContext) { users = usersService.getUsers(loginContext.getId()); } List permissions = null; List roles = new ArrayList<>(); //超级管理员拥有所有角色和权限 - if(users.getType().equals(UserTypeEnum.SUPPER_ADMIN.getId())) { + if (users.getType().equals(UserTypeEnum.SUPPER_ADMIN.getId())) { RolesQuery rolesQuery = new RolesQuery(); rolesQuery.setYn(YnEnums.YES.getId()); roles = rolesService.queryRoles(rolesQuery); @@ -432,41 +437,28 @@ public class UsersController extends BaseController { } //其他用户 - else if(users.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId()) || users.getType().equals(UserTypeEnum.NORMAL_USER.getId())){ + else if (users.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId()) || users.getType().equals(UserTypeEnum.NORMAL_USER.getId())) { //获取用户角色信息 UserRoleMapsQuery query = new UserRoleMapsQuery(); query.setUserId(users.getId()); query.setYn(YnEnums.YES.getId()); List userRoleMapses = userRoleMapsService.queryUserRoleList(query); - RolePermissionMapsQuery rolePermissionMapsQuery ; + List permissionIds = new ArrayList<>(); - permissions = new ArrayList<>(); - for(Integer roleMaps : userRoleMapses) { - roles.add(rolesService.getRoles(roleMaps)); - - //获取角色权限信息 - /* rolePermissionMapsQuery = new RolePermissionMapsQuery(); - rolePermissionMapsQuery.setRoleId(roleMaps); - rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); - List rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); - - for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { - Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId()); - if(null != permissions1) { - if(null == permissions) { - permissions = new ArrayList<>(); - } - if(!permissionIds.contains(permissions1.getId())) { - permissions.add(permissions1); - permissionIds.add(permissions1.getId()); - } - } - }*/ + permissions = new ArrayList<>(); + String orgId = autoMatchFacade.getHospitalId(loginContext.getId()); + + int rog = NumberUtils.toInt(orgId); + for (Integer roleMaps : userRoleMapses) { + Roles roles1 = rolesService.getRoles(roleMaps); + if (roles1 != null && StringUtils.isNotEmpty(orgId) && roles1.getOrgId() == rog) { + roles.add(roles1); + } } List local = permissions2Service.queryPermissionByRoleIds(userRoleMapses); - if(CollectionUtils.isNotEmpty(local)){ - for(Permissions2 permissions1:local){ - if(!permissionIds.contains(permissions1.getId())) { + if (CollectionUtils.isNotEmpty(local)) { + for (Permissions2 permissions1 : local) { + if (!permissionIds.contains(permissions1.getId())) { permissionIds.add(permissions1.getId()); permissions.add(permissions1); } @@ -487,9 +479,9 @@ public class UsersController extends BaseController { Organization organization = organizationService.getOrganization(users.getOrgId()); organizations.add(organization); users.setOrganization(organization); - List list2 = accessPermissionFacade.getOrganization(permissionsModelList); - if(CollectionUtils.isNotEmpty(list2)){ - for(Organization o:list2){ + List list2 = accessPermissionFacade.getOrganization(permissionsModelList); + if (CollectionUtils.isNotEmpty(list2)) { + for (Organization o : list2) { organizations.add(o); } } @@ -498,7 +490,7 @@ public class UsersController extends BaseController { Map map = new HashMap<>(); map.put("user", users); - map.put("watermark", CompressEncodeingUtil.compressNumber(users.getId().toString()+DateUtil.getymd6())); + map.put("watermark", CompressEncodeingUtil.compressNumber(users.getId().toString() + DateUtil.getymd6())); map.put("roles", roles); map.put("permissions", permissions); @@ -511,12 +503,12 @@ public class UsersController extends BaseController { @RequestMapping(value = "/users/userRole/{id}", method = RequestMethod.GET) @TokenRequired public void userRole(HttpServletResponse response, HttpServletRequest request, @PathVariable(value = "id") Integer id) { - UserRoleMapsQuery query = new UserRoleMapsQuery(); + UserRoleMapsQuery query = new UserRoleMapsQuery(); query.setUserId(id); query.setYn(YnEnums.YES.getId()); List userRoleMapses = userRoleMapsService.queryUserRoleMaps(query); List roles = new ArrayList<>(); - for(UserRoleMaps roleMaps : userRoleMapses) { + for (UserRoleMaps roleMaps : userRoleMapses) { roles.add(rolesService.getRoles(roleMaps.getRoleId())); } @@ -524,13 +516,12 @@ public class UsersController extends BaseController { } - /** * 管理员权限设置 */ @RequestMapping(value = "/adminPermissions", method = RequestMethod.POST) @TokenRequired - public void adminPermissions(HttpServletResponse response,@RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids){ + public void adminPermissions(HttpServletResponse response, @RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids) { if (ids == null) { ResultUtils.buildParameterErrorResultAndWrite(response); @@ -549,7 +540,7 @@ public class UsersController extends BaseController { return; } - if(!usersList.get(0).getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { + if (!usersList.get(0).getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { ResultUtils.buildParameterErrorResultAndWrite(response, "用户错误"); return; } @@ -558,8 +549,8 @@ public class UsersController extends BaseController { UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); userOrganizationMapsQuery.setUserId(userId); List userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery); - if(0 < userOrganizationMapsList.size()) { - for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { + if (0 < userOrganizationMapsList.size()) { + for (UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { userOrganizationMaps.setYn(YnEnums.NO.getId()); userOrganizationMapsService.updateUserOrganizationMaps(userOrganizationMaps); } @@ -567,12 +558,12 @@ public class UsersController extends BaseController { //添加最新权限映射 String[] roleArrayIds = ids.split(","); - Users user = usersList.get(0); + Users user = usersList.get(0); UserOrganizationMaps userOrganizationMaps = null; Organization organization = null; for (String id : roleArrayIds) { organization = organizationService.getOrganization(Integer.valueOf(id)); - if(null != organization) { + if (null != organization) { userOrganizationMaps = new UserOrganizationMaps(); userOrganizationMaps.setUserId(user.getId()); userOrganizationMaps.setOrgId(Integer.valueOf(id)); @@ -591,7 +582,7 @@ public class UsersController extends BaseController { private Boolean isPhone(String phone) { - return phone.matches("^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\\d{8})$"); + return phone.matches("^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\\d{8})$"); } /** @@ -602,7 +593,7 @@ public class UsersController extends BaseController { public void addAdmin(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "name", required = false) String name, - @RequestParam(value = "account", required = false)String account, + @RequestParam(value = "account", required = false) String account, @RequestParam(value = "phone") String phone, @RequestParam(value = "enable", required = false) Integer enable, @RequestParam(value = "remarks", required = false) String remarks, @@ -615,7 +606,7 @@ public class UsersController extends BaseController { if (StringUtils.isBlank(roleIds) || - StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user ) { + StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } @@ -669,9 +660,9 @@ public class UsersController extends BaseController { //关联登录中心ID LoginContext loginContext = null; // loginContext = LoginUtil.register(null, phone, null, null, token, typeId); - loginContext = iSessionProvider.register(null,phone,null,null); + loginContext = iSessionProvider.register(null, phone, null, null); //0 成功 4009 已注册 - if(loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { + if (loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { users.setLogincenterId(loginContext.getId()); usersService.addUsers(users); @@ -680,7 +671,7 @@ public class UsersController extends BaseController { String[] roleArrayIds = roleIds.split(","); - List user1 = usersService.queryUsers(usersQuery); + List user1 = usersService.queryUsers(usersQuery); for (String id : roleArrayIds) { Roles roles = rolesService.getRoles(Integer.valueOf(id)); if (roles == null || roles.getYn() == YnEnums.NO.getId()) { @@ -716,13 +707,13 @@ public class UsersController extends BaseController { @RequestParam(value = "deptId", required = false) Integer deptId, @RequestParam(value = "ksId", required = false) Integer ksId, @RequestParam(value = "name", required = false) String name, - @RequestParam(value = "account", required = false)String account, + @RequestParam(value = "account", required = false) String account, @RequestParam(value = "password", required = false) String password, @RequestParam(value = "phone", required = false) String phone, @RequestParam(value = "enable", required = false) Integer enable, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "roleIds") String roleIds, - @RequestParam(value = "zhiCId")Integer zhiCId) { + @RequestParam(value = "zhiCId") Integer zhiCId) { //获取登录用户 @@ -730,19 +721,19 @@ public class UsersController extends BaseController { Users user = usersService.getUsers(loginState.getId()); - if (StringUtils.isBlank(roleIds) || null == user|| (StringUtils.isBlank(account) && StringUtils.isBlank(phone))) { + if (StringUtils.isBlank(roleIds) || null == user || (StringUtils.isBlank(account) && StringUtils.isBlank(phone))) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } - if( StringUtils.isNotBlank(phone) && !isPhone(phone)) { + if (StringUtils.isNotBlank(phone) && !isPhone(phone)) { ResultUtils.buildParameterErrorResultAndWrite(response, "手机号格式不正确"); return; - } else if(StringUtils.isNotBlank(account) && StringUtils.isBlank(password)) { + } else if (StringUtils.isNotBlank(account) && StringUtils.isBlank(password)) { password = defaultPwd; } - if(deptId == null && ksId == null) { + if (deptId == null && ksId == null) { ResultUtils.buildParameterErrorResultAndWrite(response, "deptId or ksId required"); return; } @@ -757,7 +748,7 @@ public class UsersController extends BaseController { }*/ if (user != null) { UsersQuery usersQuery = new UsersQuery(); - if(StringUtils.isNotBlank(phone)) { + if (StringUtils.isNotBlank(phone)) { //检查注册账户是否存在 usersQuery.setPhone(phone); usersQuery.setYn(YnEnums.YES.getId()); @@ -771,11 +762,11 @@ public class UsersController extends BaseController { } } - if(StringUtils.isNotBlank(account)) { + if (StringUtils.isNotBlank(account)) { usersQuery = new UsersQuery(); usersQuery.setAccount(account); usersQuery.setYn(YnEnums.YES.getId()); - if(0 != usersService.queryUsersCount(usersQuery)) { + if (0 != usersService.queryUsersCount(usersQuery)) { Map map = new HashMap<>(); map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); map.put(ResultUtils.ERROR_MSG, "该账户已存在"); @@ -810,24 +801,25 @@ public class UsersController extends BaseController { loginContext.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); loginContext.setErrormsg("系统错误"); //关联登录中心ID - if(StringUtils.isNotBlank(phone) || StringUtils.isNotBlank(account)) { - /**/ String pwd = null; - if(StringUtils.isNotBlank(password)) { + if (StringUtils.isNotBlank(phone) || StringUtils.isNotBlank(account)) { + /**/ + String pwd = null; + if (StringUtils.isNotBlank(password)) { pwd = MD5Utils.md5(password).toUpperCase(); } // loginContext = LoginUtil.register(null, phone,account, pwd, token, typeId); - loginContext= iSessionProvider.register(null,phone,account, pwd); + loginContext = iSessionProvider.register(null, phone, account, pwd); } //0 成功 4009 已注册 - if(loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { + if (loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { users.setLogincenterId(loginContext.getId()); usersService.addUsers(users); //如有角色,则对用户角色中间表新增 String[] roleArrayIds = roleIds.split(","); - List user1 = usersService.queryUsers(usersQuery); + List user1 = usersService.queryUsers(usersQuery); for (String id : roleArrayIds) { Roles roles = rolesService.getRoles(Integer.valueOf(id)); if (roles == null || roles.getYn() == YnEnums.NO.getId()) { @@ -858,28 +850,28 @@ public class UsersController extends BaseController { public void updateUsers(HttpServletResponse response, HttpServletRequest request, @PathVariable(value = "id") Integer id, - @RequestParam(value = "name",required = false) String name, - @RequestParam(value = "account",required = false)String account, - @RequestParam(value = "password",required = false)String password, - @RequestParam(value = "phone",required = false) String phone, - @RequestParam(value = "enable",required = false) Integer enable, - @RequestParam(value = "remarks",required = false) String remarks, - @RequestParam(value = "roleIds",required = false) String roleIds, - @RequestParam(value = "orgId",required = false) Integer orgId, - @RequestParam(value = "deptId",required = false) Integer deptId, - @RequestParam(value = "zhiCId")Integer zhiCId) { - - if(StringUtils.isBlank(phone) && StringUtils.isBlank(account)) { + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "account", required = false) String account, + @RequestParam(value = "password", required = false) String password, + @RequestParam(value = "phone", required = false) String phone, + @RequestParam(value = "enable", required = false) Integer enable, + @RequestParam(value = "remarks", required = false) String remarks, + @RequestParam(value = "roleIds", required = false) String roleIds, + @RequestParam(value = "orgId", required = false) Integer orgId, + @RequestParam(value = "deptId", required = false) Integer deptId, + @RequestParam(value = "zhiCId") Integer zhiCId) { + + if (StringUtils.isBlank(phone) && StringUtils.isBlank(account)) { ResultUtils.buildParameterErrorResultAndWrite(response, "帐号和手机号不能同时为空"); return; } - if(null == roleIds) { + if (null == roleIds) { ResultUtils.buildParameterErrorResultAndWrite(response, "roleIds不能为空"); return; } - if(!(null != enable && (1 == enable || 2 == enable))) { + if (!(null != enable && (1 == enable || 2 == enable))) { ResultUtils.buildParameterErrorResultAndWrite(response, "enable参数错误"); return; } @@ -890,10 +882,10 @@ public class UsersController extends BaseController { if (user != null) { Users users = usersService.getUsers(id); - if(null!=users.getOtherAccount()&&"1".equals(user.getOtherAccount()+"")){ + if (null != users.getOtherAccount() && "1".equals(user.getOtherAccount() + "")) { return; } - if(StringUtils.isNotBlank(password) && password.equals(replacePwd)) { + if (StringUtils.isNotBlank(password) && password.equals(replacePwd)) { password = users.getPwd(); } @@ -906,7 +898,7 @@ public class UsersController extends BaseController { writeJson(response, JsonUtil.obj2JsonString(map)); return; }*/ - if(null == users) { + if (null == users) { Map map = new HashMap<>(); map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); map.put(ResultUtils.ERROR_MSG, "用户不存在"); @@ -916,11 +908,11 @@ public class UsersController extends BaseController { //修改了手机号, 帐号 密码 - if(!new Integer(1).equals(users.getOtherAccount())) { - if((StringUtils.isNotBlank(account) && !account.equals(users.getAccount())) || (StringUtils.isNotBlank(phone) && !phone.equals(users.getPhone())) || (StringUtils.isNotBlank(password) && !password.equals(users.getPwd()))) { + if (!new Integer(1).equals(users.getOtherAccount())) { + if ((StringUtils.isNotBlank(account) && !account.equals(users.getAccount())) || (StringUtils.isNotBlank(phone) && !phone.equals(users.getPhone())) || (StringUtils.isNotBlank(password) && !password.equals(users.getPwd()))) { UsersQuery usersQuery = new UsersQuery(); List usersList; - if(StringUtils.isNotBlank(phone) && !phone.equals(users.getPhone())) { + if (StringUtils.isNotBlank(phone) && !phone.equals(users.getPhone())) { //检查手机号是否存在 usersQuery.setPhone(phone); usersQuery.setYn(YnEnums.YES.getId()); @@ -934,7 +926,7 @@ public class UsersController extends BaseController { } } - if(StringUtils.isNotBlank(account) && !account.equals(users.getAccount())) { + if (StringUtils.isNotBlank(account) && !account.equals(users.getAccount())) { //检查账户是否存在 usersQuery = new UsersQuery(); usersQuery.setAccount(account); @@ -950,11 +942,10 @@ public class UsersController extends BaseController { } - // LoginContext loginContext = LoginUtil.register(users.getLogincenterId().toString(), phone, account, MD5Utils.md5(password).toUpperCase(), token, typeId); - LoginContext loginContext = iSessionProvider.register(users.getLogincenterId(), phone, account, StringUtils.isNotBlank(password) ? MD5Utils.md5(password).toUpperCase() : null); + LoginContext loginContext = iSessionProvider.register(users.getLogincenterId(), phone, account, StringUtils.isNotBlank(password) ? MD5Utils.md5(password).toUpperCase() : null); //0 成功 4009 已注册 - if(loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { + if (loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { users.setPhone(phone); users.setAccount(account); users.setLogincenterId(loginContext.getId()); @@ -979,7 +970,7 @@ public class UsersController extends BaseController { //如有角色,则对用户角色中间表先删除后新增 - if(StringUtils.isNotBlank(roleIds)) { + if (StringUtils.isNotBlank(roleIds)) { UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); userRoleMapsQuery.setUserId(users.getId()); @@ -990,23 +981,24 @@ public class UsersController extends BaseController { String[] roleArrayIds = roleIds.split(","); //判断角色是否有更新 Boolean flag = false; - if(CollectionUtils.isEmpty(userRoleMapses) || roleArrayIds.length != userRoleMapses.size()) flag = true; - if(!flag) { + if (CollectionUtils.isEmpty(userRoleMapses) || roleArrayIds.length != userRoleMapses.size()) + flag = true; + if (!flag) { for (String s : roleArrayIds) { boolean exist = false; - for(UserRoleMaps role : userRoleMapses) { - if(s.equals(role.getRoleId().toString())) { + for (UserRoleMaps role : userRoleMapses) { + if (s.equals(role.getRoleId().toString())) { exist = true; } } - if(!exist) { + if (!exist) { flag = true; break; } } } - if(flag) { + if (flag) { Integer _userId = users.getId(); userRoleMapsQuery = new UserRoleMapsQuery(); userRoleMapsQuery.setUserId(_userId); @@ -1018,7 +1010,7 @@ public class UsersController extends BaseController { for (String tmp : roleArrayIds) { - if(StringUtils.isEmpty(tmp)){ + if (StringUtils.isEmpty(tmp)) { continue; } Roles roles = rolesService.getRoles(Integer.valueOf(tmp)); @@ -1045,7 +1037,7 @@ public class UsersController extends BaseController { */ @RequestMapping(value = "/users/enable", method = RequestMethod.POST) @TokenRequired - public void enableUsers(HttpServletResponse response,@RequestParam Integer id, @RequestParam Integer flag) { + public void enableUsers(HttpServletResponse response, @RequestParam Integer id, @RequestParam Integer flag) { //检查账户是否存在 @@ -1059,10 +1051,10 @@ public class UsersController extends BaseController { writeJson(response, JsonUtil.obj2JsonString(map)); return; } - Users users =null; - if(CollectionUtils.isNotEmpty(usersList)){ - users =usersList.get(0); - if(null!=users.getOtherAccount()&&"1".equals(users.getOtherAccount()+"")){ + Users users = null; + if (CollectionUtils.isNotEmpty(usersList)) { + users = usersList.get(0); + if (null != users.getOtherAccount() && "1".equals(users.getOtherAccount() + "")) { return; } } @@ -1076,14 +1068,12 @@ public class UsersController extends BaseController { } - - /** * 用户删除 */ @RequestMapping(value = "/users/{id}", method = RequestMethod.DELETE) @TokenRequired - public void deleteUsers(HttpServletResponse response,@PathVariable Integer id) { + public void deleteUsers(HttpServletResponse response, @PathVariable Integer id) { if (null == id) { ResultUtils.buildIdIsNull(response); return; @@ -1125,9 +1115,6 @@ public class UsersController extends BaseController { } - - - /** * 重置用户密码 */ @@ -1142,7 +1129,7 @@ public class UsersController extends BaseController { } if (StringUtils.isNotBlank(pwd)) { if (MD5Utils.md5(pwd).equals(users.getPwd())) { - ResultUtils.buildResultAndWrite(response,ErrorCodeConstants.USER_PASSWORD_ERROR, "新密码不能和初始密码相同"); + ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.USER_PASSWORD_ERROR, "新密码不能和初始密码相同"); return; } users.setPwd(MD5Utils.md5(pwd)); @@ -1152,11 +1139,11 @@ public class UsersController extends BaseController { users.setModified(new Date()); users.setLastLoginTime(users.getModified()); usersService.updateUsers(users); - LoginContext loginContext = iSessionProvider.register(users.getLogincenterId(), users.getPhone(),users.getAccount(), users.getPwd().toUpperCase()); - if(loginContext.getErrorcode().equals(0)) { + LoginContext loginContext = iSessionProvider.register(users.getLogincenterId(), users.getPhone(), users.getAccount(), users.getPwd().toUpperCase()); + if (loginContext.getErrorcode().equals(0)) { ResultUtils.buildSuccessResultAndWrite(response); } else { - ResultUtils.buildResultAndWrite(response,ErrorCodeConstants.SYSTEM_ERROR, "系统错误"); + ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, "系统错误"); } }