增删改角色、功能菜单，角色权限重新加载

dblayer-mbg/src/main/resources/mapper/RoleMapper.xml

@@ -8,7 +8,7 @@
             sys_role r
         WHERE
             r.is_deleted = 'N'
-        AND r.creator = #{getRolePageVO.creator}
+
         AND r.hospital_id = #{getRolePageVO.hospitalId}
         AND r.remark != 'ManagementRole'
         <if test="getRolePageVO.name!=null and getRolePageVO.name!=''">

security-center/src/main/java/com/lantone/security/enums/DataAuthDataTypeEnum.java

@@ -51,6 +51,6 @@ public enum DataAuthDataTypeEnum implements KeyedNamed {
 
     @Override
     public String getName() {
-        return null;
+        return name;
     }
 }

security-center/src/main/java/com/lantone/security/enums/DataAuthDetailTypeEnum.java

@@ -47,6 +47,6 @@ public enum DataAuthDetailTypeEnum implements KeyedNamed {
 
     @Override
     public String getName() {
-        return null;
+        return name;
     }
 }

security-center/src/main/java/com/lantone/security/enums/DictionaryEnum.java

@@ -44,6 +44,6 @@ public enum DictionaryEnum implements KeyedNamed {
 
     @Override
     public String getName() {
-        return null;
+        return name;
     }
 }

security-center/src/main/java/com/lantone/security/enums/HospitalTypeEnum.java

@@ -49,6 +49,6 @@ public enum HospitalTypeEnum implements KeyedNamed {
 
     @Override
     public String getName() {
-        return null;
+        return name;
     }
 }

security-center/src/main/java/com/lantone/security/enums/ServiceEnum.java

@@ -46,6 +46,6 @@ public enum ServiceEnum implements KeyedNamed {
 
     @Override
     public String getName() {
-        return null;
+        return name;
     }
 }

security-center/src/main/java/com/lantone/security/facade/FuncManagementFacade.java

@@ -171,6 +171,8 @@ public class FuncManagementFacade {
                 }
 
             });
+            //重新加载角色权限
+            resourceFacade.initResourceRolesMap();
             return true;
         }
         return false;
@@ -219,10 +221,15 @@ public class FuncManagementFacade {
      * @Return java.lang.Boolean
      */
     public Boolean disableMenu(Long id, String status) {
-        return menuFacade.update(new UpdateWrapper<Menu>()
+        boolean flag = menuFacade.update(new UpdateWrapper<Menu>()
                 .set("status", status)
                 .eq("id", id)
                 .eq("is_deleted", IsDeleteEnum.N.getKey()));
+        if(flag){
+            //重新加载角色权限
+            resourceFacade.initResourceRolesMap();
+        }
+        return flag;
     }
 
     /**
@@ -235,7 +242,12 @@ public class FuncManagementFacade {
         if (menuFacade.remove(new UpdateWrapper<Menu>()
                 .eq("id", id)
                 .eq("is_deleted", IsDeleteEnum.N.getKey()))) {
-            return deleteMenuJoinDate(id, 1l);
+            boolean flag = deleteMenuJoinDate(id, 1l);
+            if(flag){
+                //重新加载角色权限
+                resourceFacade.initResourceRolesMap();
+            }
+            return flag;
         } else {
             Asserts.fail("菜单详情删除失败");
         }

security-center/src/main/java/com/lantone/security/facade/RoleManagementFacade.java

@@ -30,6 +30,7 @@ import com.lantone.dblayermbg.entity.RoleSoftwareResource;
 import com.lantone.dblayermbg.entity.UserRole;
 import com.lantone.dblayermbg.facade.DictionaryInfoFacade;
 import com.lantone.dblayermbg.facade.HospitalFacade;
+import com.lantone.dblayermbg.facade.ResourceFacade;
 import com.lantone.dblayermbg.facade.RoleFacade;
 import com.lantone.dblayermbg.facade.RoleSoftwareMenuFacade;
 import com.lantone.dblayermbg.facade.RoleSoftwareResourceFacade;
@@ -75,7 +76,8 @@ public class RoleManagementFacade {
     private HospitalFacade hospitalFacade;
     @Autowired
     private DictionaryInfoFacade dictionaryInfoFacade;
-
+    @Autowired
+    private ResourceFacade resourceFacade;
 
 
     /**
@@ -87,7 +89,12 @@ public class RoleManagementFacade {
         if (roleFacade.remove(new UpdateWrapper<Role>()
                 .eq("id", roleId)
                 .eq("is_deleted", IsDeleteEnum.N.getKey()))) {
-            return deleteRoleSoftwareMenu(roleId);
+            boolean flag = deleteRoleSoftwareMenu(roleId);
+            if (flag){
+                //重新加载角色权限
+                resourceFacade.initResourceRolesMap();
+            }
+            return flag;
         } else {
             Asserts.fail("角色删除失败");
         }
@@ -165,6 +172,10 @@ public class RoleManagementFacade {
                 out.set(new RoleSoftwareResourceServiceImpl().saveBatch(roleSoftwareResources));
             }
         });
+        if (out.get()){
+            //重新加载角色权限
+            resourceFacade.initResourceRolesMap();
+        }
         return out.get();
     }