From 39a0aaff8e5289984f3a3614e015beb79dfe360c Mon Sep 17 00:00:00 2001 From: fangcheng Date: Thu, 20 Apr 2017 16:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/base/common/dao/role/PermissionsMapper.java | 3 ++- .../java/com/lyms/base/common/dao/role/PermissionsMapper.xml | 6 +++++- .../lyms/base/common/service/role/PermissionsService.java | 12 +++++++----- .../common/service/role/impl/PermissionsServiceImpl.java | 10 +++++----- parent/center.manager/pom.xml | 2 ++ .../src/main/java/com/lyms/cm/shiro/ShiroRealm.java | 2 +- .../main/java/com/lyms/web/controller/BaseController.java | 6 ++++++ .../java/com/lyms/hospital/controller/LoginController.java | 3 ++- parent/pom.xml | 6 ------ 9 files changed, 30 insertions(+), 20 deletions(-) diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.java index b544831..b3de482 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.java @@ -3,6 +3,7 @@ package com.lyms.base.common.dao.role; import java.io.Serializable; import java.util.List; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.mapper.BaseMapper; @@ -24,6 +25,6 @@ public interface PermissionsMapper extends BaseMapper { List getMenuTreeByPuri(String puri); - List getUserPermission(String uid); + List getUserPermission(@Param("uid")String uid,@Param("type")String type); } \ No newline at end of file diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.xml index a9fb5c5..20c4903 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.xml @@ -33,6 +33,10 @@ select PERMISSION_ID from SYS_ROLE_PERMISSION_MAPS rp where ROLE_ID in ( select role_id from SYS_USER_ROLE_MAPS where user_id= #{uid} ) - ) and type = 1 and ifDel = 0 and enable = 1 + ) + + and type = #{type} + + and ifDel = 0 and enable = 1 diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/role/PermissionsService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/role/PermissionsService.java index 62bf827..b9b7601 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/role/PermissionsService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/role/PermissionsService.java @@ -41,23 +41,25 @@ public interface PermissionsService extends BaseService { /** *
  • @Description:权限列表Set，方便Shiro使用 *
  • @param uid + *
  • @param type *
  • @return *
  • 创建人：方承 *
  • 创建时间：2017年3月9日 *
  • 修改人： *
  • 修改时间： */ - public Set getUserPermissionSet(String uid); + public Set getUserPermissionSet(String uid,String type); - /** + /** *
  • @Description:权限列表Set，方便Shiro使用 *
  • @param uid + *
  • @param type *
  • @return *
  • 创建人：方承 - *
  • 创建时间：2017年3月9日 + *
  • 创建时间：2017年4月20日 *
  • 修改人： *
  • 修改时间： - */ - public List getUserPermission(String uid); + */ + public List getUserPermission(String uid,String type); } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/role/impl/PermissionsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/role/impl/PermissionsServiceImpl.java index 1c362fb..4c1d2d3 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/role/impl/PermissionsServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/role/impl/PermissionsServiceImpl.java @@ -79,7 +79,7 @@ public class PermissionsServiceImpl extends ServiceImpl getPermissionMenuTreeByPuri(String puri, Users user) { // 用户权限列表 - Map permissionsMap = getUserPermissionMap(getUserPermissionSet(user.getId())); + Map permissionsMap = getUserPermissionMap(getUserPermissionSet(user.getId(),"1")); // 所有菜单 List allMenu = getAllMenuTreeByPuri(puri); // 初始化要返回的有权限的菜单 @@ -143,14 +143,14 @@ public class PermissionsServiceImpl extends ServiceImpl修改时间： */ @Override - public List getUserPermission(String uid) { - return baseMapper.getUserPermission(uid); + public List getUserPermission(String uid,String type) { + return baseMapper.getUserPermission(uid,type); } @Override - public Set getUserPermissionSet(String uid) { + public Set getUserPermissionSet(String uid,String type) { Set pSet = InstanceUtils.newHashSet(); - List pList = getUserPermission(uid); + List pList = getUserPermission(uid,type); for (Permissions p : pList) { if (StrUtils.isNotEmpty(p.getUri())) pSet.add(p.getUri()); diff --git a/parent/center.manager/pom.xml b/parent/center.manager/pom.xml index 6ac02bb..68d7ca0 100644 --- a/parent/center.manager/pom.xml +++ b/parent/center.manager/pom.xml @@ -130,6 +130,8 @@ online + + src/main/resources diff --git a/parent/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java b/parent/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java index 6cac75d..c11152c 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java @@ -64,7 +64,7 @@ public class ShiroRealm extends AuthorizingRealm { if (CollectionUtils.isNotEmpty(roleIdList)) { authorizationInfo.setRoles(new HashSet(roleIdList)); } - authorizationInfo.setStringPermissions(sysPermissionsService.getUserPermissionSet(user.getId())); + authorizationInfo.setStringPermissions(sysPermissionsService.getUserPermissionSet(user.getId(),"1")); return authorizationInfo; } diff --git a/parent/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java b/parent/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java index a0eec64..18f1c2d 100644 --- a/parent/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java +++ b/parent/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java @@ -11,6 +11,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,6 +82,11 @@ public class BaseController { request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); return request.getParameter(name); } + + protected HttpSession getSession(){ + request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + return request.getSession(); + } /** * 重定向至地址 url diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java index f27c50e..9248e98 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java @@ -3,6 +3,7 @@ package com.lyms.hospital.controller; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; @@ -127,7 +128,7 @@ public class LoginController extends BaseController { Map result = InstanceUtils.newHashMap(); String token = tokenService.createToken(users); List roles = rolesService.selectBatchIds(usersService.getRoleIdListByUserid(users.getId())); - List permissions = permissionsService.getUserPermission(users.getId()); + List permissions = permissionsService.getUserPermission(users.getId(),null); Organizations org = organizationsService.selectById(users.getOrgId()); result.put("token", token); users.setLastLoginTime(DateTimeUtils.getNow()); diff --git a/parent/pom.xml b/parent/pom.xml index 37e540f..1c65bcd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -240,12 +240,6 @@ bcprov-jdk14 ${bcprov-jdk14.version} - - - com.google.zxing - core - 3.2.1 - net.coobird -- 1.8.3.1