From 7d64716cb0d406f21cde03976fd273bd07fdc06f Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 28 九月 2021 11:44:28 +0800
Subject: [PATCH] 更新用户-角色-菜单-权限
---
src/main/java/com/whyc/service/UserBridgeService.java | 5 ++++-
src/main/java/com/whyc/service/RolePermissionService.java | 6 +-----
src/main/resources/mapper/RolePermissionMapper.xml | 6 ------
src/main/java/com/whyc/mapper/RolePermissionMapper.java | 9 +--------
4 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/RolePermissionMapper.java b/src/main/java/com/whyc/mapper/RolePermissionMapper.java
index df3122d..563bc8c 100644
--- a/src/main/java/com/whyc/mapper/RolePermissionMapper.java
+++ b/src/main/java/com/whyc/mapper/RolePermissionMapper.java
@@ -12,14 +12,7 @@
*/
public interface RolePermissionMapper extends CustomMapper<RolePermission> {
- @Select("select p.name from tb_role_permission rp inner join tb_permission p on rp.permission_id = p.id inner join tb_user_role ur\n" +
- "on rp.role_id = ur.role_id\n" +
- "where ur.user_id=1 \n")
- List<Permission> getPermissions(Integer userId);
-
- List<String> findPermissionsByUserId(@Param("userId") int userId);
-
- List<Permission> getPermissionListByUserId(Integer userId, Integer status);
+ List<Permission> getPermissionListByUserId(Integer userId);
List<Permission> getPermissionListByMenuId(Integer roleId, Integer menuId);
diff --git a/src/main/java/com/whyc/service/RolePermissionService.java b/src/main/java/com/whyc/service/RolePermissionService.java
index b6681d9..dcee64f 100644
--- a/src/main/java/com/whyc/service/RolePermissionService.java
+++ b/src/main/java/com/whyc/service/RolePermissionService.java
@@ -23,16 +23,12 @@
return mapper.insertBatchSomeColumn(rolePermissions)== rolePermissions.size();
}
- public List<Permission> getPermissions(Integer userId) {
- return mapper.getPermissions(userId);
- }
-
public List<Permission> getPermissionListByMenuId(Integer roleId, Integer menuId) {
return mapper.getPermissionListByMenuId(roleId,menuId);
}
public List<Permission> getPermissionListByUserId(Integer userId) {
- return mapper.getPermissionListByUserId(userId,null);
+ return mapper.getPermissionListByUserId(userId);
}
public boolean updateBatch(List<RolePermission> rolePermissions) {
diff --git a/src/main/java/com/whyc/service/UserBridgeService.java b/src/main/java/com/whyc/service/UserBridgeService.java
index 51d0363..616816c 100644
--- a/src/main/java/com/whyc/service/UserBridgeService.java
+++ b/src/main/java/com/whyc/service/UserBridgeService.java
@@ -23,6 +23,7 @@
import javax.annotation.Resource;
import java.util.LinkedList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 澶勭悊 shiro璁よ瘉,鎺堟潈,鍜屾暟鎹簱浜や簰
@@ -66,6 +67,7 @@
System.out.println("=========鎵ц浜哢serBridgeService.getAuthorization鏂规硶==========");
SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo();
//娣诲姞Roles鍜孭ermissions
+ //鏈」鐩富瑕佷娇鐢╬ermissions
List<String> roles = findRolesByUserId(user.getId());
List<String> perms = findPermissionsByUserId(user.getId());
@@ -75,7 +77,8 @@
}
private List<String> findPermissionsByUserId(int userId) {
- List<String> perms = rolePermissionMapper.findPermissionsByUserId(userId);
+ List<Permission> permissionList = rolePermissionMapper.getPermissionListByUserId(userId);
+ List<String> perms = permissionList.stream().map(Permission::getValue).collect(Collectors.toList());
return perms;
}
diff --git a/src/main/resources/mapper/RolePermissionMapper.xml b/src/main/resources/mapper/RolePermissionMapper.xml
index 59d37e2..d1b55b4 100644
--- a/src/main/resources/mapper/RolePermissionMapper.xml
+++ b/src/main/resources/mapper/RolePermissionMapper.xml
@@ -8,12 +8,6 @@
</update>
- <select id="findPermissionsByUserId" resultType="java.lang.String">
- select p.name from tb_user_role ur,tb_role_permission rp,tb_permission p
- where ur.role_id = rp.role_id
- and rp.permission_id=p.id
- and user_id=#{userId};
- </select>
<select id="getPermissionListByUserId" resultType="Permission">
SELECT
p.*
--
Gitblit v1.9.1