From 2c5e3e76285ab7467851e1399b2991f69b87ee8b Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 17 Jun 2024 10:03:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81premission=20->=20permission=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9B=202?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E7=BB=99=E7=94=A8=E6=88=B7=E6=8E=88=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=88=B7=E6=96=B0=E6=9C=AC=E5=9C=B0=E7=BC=93?= =?UTF-8?q?=E5=AD=98=EF=BC=9B=203=E3=80=81=E8=A7=92=E8=89=B2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=B6=85=E7=AE=A1=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=86=85=E7=BD=AE=E8=A7=92=E8=89=B2=E3=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D=E7=94=A8=E6=88=B7=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=9C=A8=E8=B6=85=E7=AE=A1=E4=B8=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E5=8F=AA?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=B6=85=E7=AE=A1=E6=89=80=E5=9C=A8=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E7=9A=84=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/permission/RoleMapper.java | 8 +++---- .../RedisRefreshChannelTopicConstants.java | 2 +- ...SystemPermissionRefreshRedisListener.java} | 13 ++++++------ .../permission/PermissionServiceImpl.java | 21 +++++++++++++++++-- 4 files changed, 30 insertions(+), 14 deletions(-) rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/{SystemPremissionRefreshRedisListener.java => SystemPermissionRefreshRedisListener.java} (66%) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java index 486b92c2c..89b9d48bf 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java @@ -27,11 +27,11 @@ public interface RoleMapper extends BaseMapperX { lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId,0L,loginUser.getOrganId()); }*/ if(isSupAdmin && ObjectUtil.isNotNull(reqVO.getOrganId())) { - //如果是超级管理员并且传入organId,就查看传入的组织 - lambdaQueryWrapperX.eqIfPresent(RoleDO::getOrganId, reqVO.getOrganId()); + //如果是超级管理员并且传入organId,就查看组织id为0（内置角色）和传入的组织 + lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId, 0L, reqVO.getOrganId()); } else { - //如果不是，就查看组织id为0和自身的组织 - lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId,0L,loginUser.getOrganId()); + //如果不是，就查看组织id为0（内置角色）和自身的组织 + lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId, 0L, loginUser.getOrganId()); } lambdaQueryWrapperX.likeIfPresent(RoleDO::getName, reqVO.getName()) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/RedisRefreshChannelTopicConstants.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/RedisRefreshChannelTopicConstants.java index 89b2dd743..4b83c1160 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/RedisRefreshChannelTopicConstants.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/RedisRefreshChannelTopicConstants.java @@ -11,5 +11,5 @@ public interface RedisRefreshChannelTopicConstants { /** * 刷新权限 */ - String PREMISSION_REFRESH = "PREMISSION_REFRESH"; + String PERMISSION_REFRESH = "PERMISSION_REFRESH"; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPremissionRefreshRedisListener.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPermissionRefreshRedisListener.java similarity index 66% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPremissionRefreshRedisListener.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPermissionRefreshRedisListener.java index a16cb6023..b546ebc45 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPremissionRefreshRedisListener.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/listener/SystemPermissionRefreshRedisListener.java @@ -3,25 +3,24 @@ package com.cf.imes.module.system.dal.redis.listener; import com.cf.imes.framework.mq.redis.core.pubsub.AbstractRedisSimpleMessageListener; import com.cf.imes.framework.security.core.service.SecurityFrameworkService; import com.cf.imes.module.system.dal.redis.RedisRefreshChannelTopicConstants; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.listener.ChannelTopic; import org.springframework.stereotype.Component; /** - * system PREMISSION_REFRESH redis监听器 + * system PERMISSION_REFRESH redis监听器 * * @author Gqr * @since 2024/6/13 10:32 */ @Component -public class SystemPremissionRefreshRedisListener extends AbstractRedisSimpleMessageListener { +public class SystemPermissionRefreshRedisListener extends AbstractRedisSimpleMessageListener { - @Autowired - private SecurityFrameworkService securityFrameworkService; + private final SecurityFrameworkService securityFrameworkService; - public SystemPremissionRefreshRedisListener() { - super.setTopic(new ChannelTopic(RedisRefreshChannelTopicConstants.PREMISSION_REFRESH)); + public SystemPermissionRefreshRedisListener(SecurityFrameworkService securityFrameworkService) { + super.setTopic(new ChannelTopic(RedisRefreshChannelTopicConstants.PERMISSION_REFRESH)); + this.securityFrameworkService = securityFrameworkService; } @Override diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java index f58486c80..9d09cf68e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java @@ -10,6 +10,7 @@ import com.cf.imes.framework.datapermission.core.annotation.DataPermission; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.framework.organ.core.context.OrganContextHolder; +import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.system.api.permission.dto.DeptDataPermissionRespDTO; import com.cf.imes.module.system.controller.admin.permission.vo.permission.PermissionAssignUserRoleReqVO; @@ -188,9 +189,9 @@ public class PermissionServiceImpl implements PermissionService { // 角色菜单权限发生修改，通知刷新本地缓存 if (CollectionUtil.isNotEmpty(createMenuIds) || CollectionUtil.isNotEmpty(deleteMenuIds)) { CompletableFuture.runAsync(() -> { - redisTemplate.convertAndSend(RedisRefreshChannelTopicConstants.PREMISSION_REFRESH, ""); + redisTemplate.convertAndSend(RedisRefreshChannelTopicConstants.PERMISSION_REFRESH, ""); }).exceptionally(e -> { - log.error("redis message发送失败, topic:{}, 异常:{}", RedisRefreshChannelTopicConstants.PREMISSION_REFRESH, e.getMessage()); + log.error("redis message发送失败, topic:{}, 异常:{}", RedisRefreshChannelTopicConstants.PERMISSION_REFRESH, e.getMessage()); return null; }); } @@ -266,6 +267,12 @@ public class PermissionServiceImpl implements PermissionService { @Override public Set getListRoleUsers(Long roleId, Long organId) { + // 超管查看时没有选择机构则查看本机构 + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + assert loginUser != null; + if (loginUser.getIsSupAdmin() && organId == null) { + organId = loginUser.getOrganId(); + } List userRoleDOS = userRoleMapper.selectList(new LambdaQueryWrapperX() .eqIfPresent(UserRoleDO::getOrganId, organId) .eq(UserRoleDO::getRoleId, roleId) @@ -326,6 +333,16 @@ public class PermissionServiceImpl implements PermissionService { if (!CollectionUtil.isEmpty(deleteMenuIds)) { userRoleMapper.deleteListByUserIdAndRoleIdIds(userId, deleteMenuIds); } + + // 角色菜单权限发生修改，通知刷新本地缓存 + if (CollectionUtil.isNotEmpty(createRoleIds) || CollectionUtil.isNotEmpty(deleteMenuIds)) { + CompletableFuture.runAsync(() -> { + redisTemplate.convertAndSend(RedisRefreshChannelTopicConstants.PERMISSION_REFRESH, ""); + }).exceptionally(e -> { + log.error("redis message发送失败, topic:{}, 异常:{}", RedisRefreshChannelTopicConstants.PERMISSION_REFRESH, e.getMessage()); + return null; + }); + } } @Override