permission bug fixed

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysPermissionService.kt

@@ -19,6 +19,11 @@ interface ISysPermissionService {
      */
     fun evictCache(id: Long)
 
+    /**
+     * 移除 指定用户集 的缓存
+     */
+    fun evictCache(ids: Set<Long>)
+
     fun clearCache()
 
 //    /**

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysUserRoleService.kt

@@ -18,6 +18,11 @@ interface ISysUserRoleService : BaseService<SysUserRole> {
      */
     fun getUserRoleListByUserId(id: Long): MutableList<SysRole>
 
+    /**
+     * 获取指定角色id的用户id列表
+     */
+    fun getUserIdListByRoleId(id: Long): Set<Long>
+
     /**
      * 物理删除 roleIds指定的 用户角色列表
      */
@@ -37,6 +42,8 @@ interface ISysUserRoleService : BaseService<SysUserRole> {
      */
     fun evictCache(id: Long)
 
+    fun evictCache(ids: Set<Long>)
+
     /**
      * 获取所有用户的角色列表
      */

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysPermissionServiceImpl.kt

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service
 @Service
 class SysPermissionServiceImpl : ISysPermissionService {
 
+
     @Autowired
     private lateinit var sysUserRoleService: ISysUserRoleService
 
@@ -37,6 +38,12 @@ class SysPermissionServiceImpl : ISysPermissionService {
         RedisCacheUtil.evict(CACHEKEYS.USER_PERM, "${CACHEKEYS.USER_PERM}:uid_$id")
     }
 
+    override fun evictCache(ids: Set<Long>) {
+        ids.forEach {
+            RedisCacheUtil.evict(CACHEKEYS.USER_PERM, "${CACHEKEYS.USER_PERM}:uid_$it")
+        }
+    }
+
     override fun clearCache() {
         RedisCacheUtil.clear(CACHEKEYS.USER_PERM)
     }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysRoleServiceImpl.kt

@@ -7,6 +7,7 @@ import com.gxzc.zen.api.sys.mapper.SysRoleMapper
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.api.sys.service.ISysRoleService
+import com.gxzc.zen.api.sys.service.ISysUserRoleService
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.orm.annotation.ZenTransactional
@@ -27,6 +28,9 @@ class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleServic
     @Autowired
     private lateinit var sysPermissionService: ISysPermissionService
 
+    @Autowired
+    private lateinit var sysUserRoleService: ISysUserRoleService
+
     override fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole> {
         val wrapper = EntityWrapper<SysRole>().apply {
             if (!name.isNullOrEmpty()) {
@@ -65,17 +69,21 @@ class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleServic
     override fun modify(entity: SysRole): SysRole {
 //        baseMapper.updateById(entity)
         baseMapper.updateWOLogic(entity, EntityWrapper<SysRole>().eq("id", entity.id))
+
+        val userIdSet = sysUserRoleService.getUserIdListByRoleId(entity.id!!)
+        sysUserRoleService.evictCache(userIdSet)
         // 修改role表需要直接清理所有缓存项
-        sysPermissionService.clearCache()
+//        sysPermissionService.evictCache(userIdSet)
         return entity
     }
 
     @ZenTransactional
     override fun physicalDelete(id: Long) {
+        val userIdSet = sysUserRoleService.getUserIdListByRoleId(id)
         if (baseMapper.physicalDeleteById(id) <= 0) {
             throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
         }
         // 修改role表需要直接清理所有缓存项
-        sysPermissionService.clearCache()
+        sysUserRoleService.evictCache(userIdSet)
     }
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysUserRoleServiceImpl.kt

@@ -28,8 +28,7 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), ISysUserRoleService {
-    //    @Autowired
-//    private lateinit var sysRoleService: ISysRoleService
+
     @Autowired
     private lateinit var sysPermissionService: ISysPermissionService
 
@@ -38,6 +37,13 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
         return baseMapper.selectUserRoleListByUserId(id)
     }
 
+    override fun getUserIdListByRoleId(id: Long): Set<Long> {
+        val ret = baseMapper.selectList(EntityWrapper<SysUserRole>().eq("role_id", id)) ?: return setOf()
+        return ret.map {
+            it.userId!!
+        }.toSet()
+    }
+
     @ZenTransactional
     override fun physicalDeleteBatch(userId: Long, roleIds: List<Long>) {
         if (roleIds.isEmpty()) {
@@ -83,22 +89,17 @@ class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), IS
         evictCache(userId)
     }
 
-    // @CacheEvict(CACHEKEYS.USER_ROLE, key = "'${CACHEKEYS.USER_ROLE}:uid_'+ #id")
     override fun evictCache(id: Long) {
         RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$id")
         sysPermissionService.evictCache(id)
     }
 
-//    override fun getUserRoleList(): Map<Long, MutableList<SysRole>> {
-//        val allSysUserRole = baseMapper.selectList(null)
-//        val groupUserRole = allSysUserRole.groupBy({ it.userId }, { it.roleId })
-//        val result = mutableMapOf<Long, MutableList<SysRole>>()
-//        for (item in groupUserRole) {
-//            if (item.key == null) {
-//                continue
-//            }
-//            result[item.key!!] = sysRoleService.selectBatchIds(item.value)
-//        }
-//        return result
-//    }
+    override fun evictCache(ids: Set<Long>) {
+        ids.forEach {
+            RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$it")
+            sysPermissionService.evictCache(it)
+        }
+
+
+    }
 }