diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/UserTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/UserTypeEnum.java new file mode 100644 index 0000000..6ae4056 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/UserTypeEnum.java @@ -0,0 +1,36 @@ +package com.lyms.platform.common.enums; + +/** + * Created by Zhang.Rui on 2016/5/10. + * 用户角色类型 + */ +public enum UserTypeEnum { + NORMAL_USER(1, "普通用户"), + PLATFORM_ADMIN(0, "平台管理员"), + SUPPER_ADMIN(2, "超级管理员"); + + private int id; + private String text; + + private UserTypeEnum(int id, String text) { + this.id = id; + this.text = text; + } + + + public Integer getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java index 8fb5fb2..11661b0 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java @@ -4,6 +4,7 @@ import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.enums.PermissionTypeEnums; +import com.lyms.platform.common.enums.UserTypeEnum; import com.lyms.platform.common.enums.VisitStatusEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.JsonUtil; @@ -307,7 +308,7 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { u.setOrgId(o.getId()); u.setDeptId(d.getId()); u.setKsId(d.getId()); - u.setType(1); + u.setType(UserTypeEnum.NORMAL_USER.getId()); u.setOtherAccount(1); u.setLogincenterId(LoginUtil.aouHospitalUser(u.getAccount(), u.getPwd(), typeId, token)); usersQuery.setForeignId(u.getForeignId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java index 47db5e2..869ece0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.UserTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; @@ -202,7 +203,7 @@ public class DepartmentsController extends BaseController { departmentsQuery.setOrgId(orgId); } else if (CollectionUtils.isNotEmpty(orgId1)){ departmentsQuery.setOrgList(orgId1); - } else if(!new Integer(2).equals(users.getType())){ //不是超级管理员 + } else if(!UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())){ //不是超级管理员 FrontEndResult frontEndResult = new FrontEndResult(); frontEndResult.setPageInfo(departmentsQuery.getPageInfo()); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index b53cdd6..5618e90 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -7,10 +7,7 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.OrganizationLevelEnum; -import com.lyms.platform.common.enums.OrganizationTypeEnum; -import com.lyms.platform.common.enums.PermissionTypeEnums; -import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.facade.AccessPermissionFacade; @@ -286,7 +283,7 @@ public class OrganizationController extends BaseController { organizations = organizationService.queryOrganization(organizationQuery); pageInfo=organizationQuery.getPageInfo(); - } else if(null == areaId && users.getType().equals(2)){ + } else if(null == areaId && UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())){ // UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); // userOrganizationMapsQuery.setYn(YnEnums.YES.getId()); // userOrganizationMapsQuery.setUserId(loginState.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java index 5a50fb0..c09a5c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java @@ -6,6 +6,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.UserTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.SystemConfig; @@ -57,7 +58,7 @@ public class RegionController extends BaseController{ BasicConfigQuery query = new BasicConfigQuery(); query.setYn(YnEnums.YES.getId()); - if(user.getType().equals(1)) { + if(UserTypeEnum.NORMAL_USER.getId().equals(user.getType())) { if(null == user.getOrgId()) { ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "user not defined orgId error!"); return; @@ -87,7 +88,7 @@ public class RegionController extends BaseController{ } - if ((user.getType().equals(2) || user.getType().equals(0)) && ("0".equals(parentId) || StringUtils.isBlank(parentId))) { + if ((UserTypeEnum.SUPPER_ADMIN.getId().equals(user.getType()) || UserTypeEnum.PLATFORM_ADMIN.getId().equals(user.getType())) && ("0".equals(parentId) || StringUtils.isBlank(parentId))) { parentId = SystemConfig.CHINA_BASIC_ID; query.setParentId(parentId); } 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 8d0ebe6..5ed2902 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 @@ -7,6 +7,7 @@ import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ConstantInterface; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.UserTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AccessPermissionFacade; @@ -125,7 +126,7 @@ public class UsersController extends BaseController { List ids = null; - if(u.getType().equals(1)) { + if(u.getType().equals(UserTypeEnum.NORMAL_USER.getId())) { if(null != u.getOrgId()) { orgId = u.getOrgId(); } else { @@ -134,7 +135,7 @@ public class UsersController extends BaseController { frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); return frontEndResult; } - }else if(u.getType().equals(0)) { + }else if(u.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { List organizations = accessPermissionFacade.findAccessPerminssionByUserId(u.getId()); ids = new ArrayList<>(); if(CollectionUtils.isNotEmpty(organizations)) { @@ -321,7 +322,7 @@ public class UsersController extends BaseController { List permissions = null; List roles = new ArrayList<>(); //超级管理员拥有所有角色和权限 - if(users.getType().equals(2)) { + if(users.getType().equals(UserTypeEnum.SUPPER_ADMIN.getId())) { RolesQuery rolesQuery = new RolesQuery(); rolesQuery.setYn(YnEnums.YES.getId()); roles = rolesService.queryRoles(rolesQuery); @@ -333,7 +334,7 @@ public class UsersController extends BaseController { } //其他用户 - else if(users.getType().equals(0) || users.getType().equals(1)){ + else if(users.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId()) || users.getType().equals(UserTypeEnum.NORMAL_USER.getId())){ //获取用户角色信息 UserRoleMapsQuery query = new UserRoleMapsQuery(); query.setUserId(users.getId()); @@ -378,16 +379,16 @@ public class UsersController extends BaseController { List organizations = new ArrayList<>(); - if(null != users.getOrgId() && new Integer(1).equals(users.getType())) { //普通用户 + if(null != users.getOrgId() && UserTypeEnum.NORMAL_USER.equals(users.getType())) { //普通用户 organizations.add(organizationService.getOrganization(users.getOrgId())); - } else if(new Integer(0).equals(users.getType())) { //管理员 + } else if(UserTypeEnum.PLATFORM_ADMIN.equals(users.getType())) { //管理员 List list2 =accessPermissionFacade.findAccessPerminssionByUserId(users.getId()); if(CollectionUtils.isNotEmpty(list2)){ for(Organization organization:list2){ organizations.add(organization); } } - } else if(new Integer(2).equals(users.getType())) {//超级管理员 + } else if(UserTypeEnum.SUPPER_ADMIN.equals(users.getType())) {//超级管理员 OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setYn(YnEnums.YES.getId()); organizations = organizationService.queryOrganization(organizationQuery); @@ -446,7 +447,7 @@ public class UsersController extends BaseController { return; } - if(!usersList.get(0).getType().equals(0)) { + if(!usersList.get(0).getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { ResultUtils.buildParameterErrorResultAndWrite(response, "用户错误"); return; } @@ -540,7 +541,7 @@ public class UsersController extends BaseController { //准备添加数据 Users users = new Users(); - users.setType(0); + users.setType(UserTypeEnum.PLATFORM_ADMIN.getId()); users.setName(name); users.setAccount(account); users.setPhone(phone); @@ -645,7 +646,7 @@ public class UsersController extends BaseController { //准备添加数据 Users users = new Users(); - users.setType(1); //1普通用户 + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 users.setDeptId(deptId); users.setOrgId(orgId); users.setName(name); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java index 1cce037..a65a0a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.param.CommunityQuery; import com.lyms.platform.biz.service.CommunityConfigService; import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.common.enums.UserTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.OrganizationService; @@ -44,7 +45,7 @@ public class AutoMatchFacade { List list = usersService.queryUsers(usersQuery); if (CollectionUtils.isNotEmpty(list)) { //用户角色 - if (list.get(0).getType() == 1) { + if (UserTypeEnum.NORMAL_USER.equals(list.get(0).getType()) ) { Organization organization = organizationService.getOrganization(list.get(0).getOrgId()); return organization.getAreaId(); }else { @@ -63,13 +64,13 @@ public class AutoMatchFacade { List data = new ArrayList<>(); if (CollectionUtils.isNotEmpty(list)) { //用户角色 - if (list.get(0).getType() == 1) { + if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType())) { for(Users users:list){ if(null!=users.getOrgId()){ data.add(users.getOrgId()); } } - } else if(list.get(0).getType() == 0){ + } else if(UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())){ List list2 =accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId()); if(CollectionUtils.isNotEmpty(list2)){ for(Organization organization:list2){ @@ -85,7 +86,7 @@ public class AutoMatchFacade { data.add(userOrganizationMaps.getOrgId()); } }*/ - } else if(list.get(0).getType() == 2) { + } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(list.get(0).getType())) { return null; } }