新增数据权限变动的切入点

security-center/src/main/java/com/lantone/security/aspect/DataAuthFilterAspect.java

@@ -1,4 +1,4 @@
-package com.lantone.security.aspect;
+package com.lantone.security.aop;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;

security-center/src/main/java/com/lantone/security/aop/ResourceRoleRulesAspect.java

@@ -23,7 +23,16 @@ public class ResourceRoleRulesAspect {
     @Pointcut("execution(public * com.lantone.security.web.RoleManagementController.addRole(..))" +
             "||execution(public * com.lantone.security.web.RoleManagementController.deleteRole(..))" +
             "||execution(public * com.lantone.security.web.RoleManagementController.disableRole(..))" +
-            "||execution(public * com.lantone.security.web.RoleManagementController.updateRole(..))")
+            "||execution(public * com.lantone.security.web.RoleManagementController.updateRole(..))"+
+            "||execution(public * com.lantone.security.web.FuncManagementController.addMenu(..))"+
+            "||execution(public * com.lantone.security.web.FuncManagementController.updateMenu(..))"+
+            "||execution(public * com.lantone.security.web.FuncManagementController.deleteMenu(..))"+
+            "||execution(public * com.lantone.security.web.FuncManagementController.disableMenu(..))"+
+            "||execution(public * com.lantone.security.web.HospitalManagementController.addHospital(..))"+
+            "||execution(public * com.lantone.security.web.HospitalManagementController.updateHospital(..))"+
+            "||execution(public * com.lantone.security.web.HospitalManagementController.disableHospital(..))"+
+            "||execution(public * com.lantone.security.web.HospitalManagementController.deleteHospital(..))"
+    )
     public void basicInfoChange() {
     }
 

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

@@ -191,8 +191,6 @@ public class FuncManagementFacade {
                 }
 
             });
-            //重新加载角色权限
-            resourceFacade.initResourceRolesMap();
             return true;
         }
         return false;
@@ -245,10 +243,6 @@ public class FuncManagementFacade {
                 .set("status", status)
                 .eq("id", id)
                 .eq("is_deleted", IsDeleteEnum.N.getKey()));
-        if(flag){
-            //重新加载角色权限
-            resourceFacade.initResourceRolesMap();
-        }
         return flag;
     }
 
@@ -262,8 +256,6 @@ public class FuncManagementFacade {
         if (menuFacade.update(new UpdateWrapper<Menu>()
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 .eq("id", id))) {
-            //重新加载角色权限
-            resourceFacade.initResourceRolesMap();
             return true;
         } else {
             Asserts.fail("菜单详情删除失败");

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

@@ -105,10 +105,6 @@ public class RoleManagementFacade {
                 .eq("id", roleId)
                 .eq("is_deleted", IsDeleteEnum.N.getKey()))) {
             boolean flag = deleteRoleSoftwareMenu(roleId);
-            if (flag){
-                //重新加载角色权限
-                resourceFacade.initResourceRolesMap();
-            }
             return flag;
         } else {
             Asserts.fail("角色删除失败");
@@ -245,10 +241,6 @@ public class RoleManagementFacade {
                 out.set(new RoleSoftwareResourceServiceImpl().saveBatch(roleSoftwareResources));
             }
         });
-        if (out.get()){
-            //重新加载角色权限
-            resourceFacade.initResourceRolesMap();
-        }
         return out.get();
     }