From 20521a18b08488b0e9a2725c1baac6d13865e4b2 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 9 Oct 2023 23:20:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0.1=E3=80=91=E3=80=90system=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=9A=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/role/controller/PermissionAssignController.java | 3 +++ .../role/service/impl/PermissionAssignServiceImpl.java | 6 ++++++ .../role/service/impl/SysRoleDataScopeServiceImpl.java | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/PermissionAssignController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/PermissionAssignController.java index c3819f1b5..875e4f95d 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/PermissionAssignController.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/PermissionAssignController.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.sys.modular.role.controller; +import cn.stylefeng.roses.kernel.rule.annotation.BizLog; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -82,6 +83,7 @@ public class PermissionAssignController { */ @PostResource(name = "更新角色绑定权限", path = "/permission/updateRoleBindPermission", requiredPermission = true, requirePermissionCode = PermissionCodeConstants.CHANGE_ROLE_PERMISSION) + @BizLog(logTypeCode = PermissionCodeConstants.CHANGE_ROLE_PERMISSION) public ResponseData updateRoleBindPermission(@RequestBody @Validated(RoleBindPermissionRequest.roleBindPermission.class) RoleBindPermissionRequest roleBindPermissionRequest) { permissionAssignService.updateRoleBindPermission(roleBindPermissionRequest); @@ -110,6 +112,7 @@ public class PermissionAssignController { */ @PostResource(name = "角色绑定数据权限的配置", path = "/permission/updateRoleBindDataScope", requiredPermission = true, requirePermissionCode = PermissionCodeConstants.CHANGE_ROLE_DATA_SCOPE) + @BizLog(logTypeCode = PermissionCodeConstants.CHANGE_ROLE_DATA_SCOPE) public ResponseData updateRoleBindDataScope( @RequestBody @Validated(RoleBindDataScopeRequest.roleBindDataScope.class) RoleBindDataScopeRequest roleBindDataScopeRequest) { sysRoleDataScopeService.updateRoleBindDataScope(roleBindDataScopeRequest); diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java index f8973a98b..58c7a2c5c 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.extra.spring.SpringUtil; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; import cn.stylefeng.roses.kernel.db.api.DbOperatorApi; import cn.stylefeng.roses.kernel.event.sdk.publish.BusinessEventPublisher; +import cn.stylefeng.roses.kernel.log.api.util.BusinessLogUtil; import cn.stylefeng.roses.kernel.sys.api.SysUserRoleServiceApi; import cn.stylefeng.roses.kernel.sys.api.enums.permission.DataScopeTypeEnum; import cn.stylefeng.roses.kernel.sys.modular.app.entity.SysApp; @@ -91,6 +92,8 @@ public class PermissionAssignServiceImpl implements PermissionAssignService { @Override public void updateRoleBindPermission(RoleBindPermissionRequest roleBindPermissionRequest) { + BusinessLogUtil.setLogTitle("更新角色绑定的权限"); + // 1. 获取角色的限制范围，如果限制范围为空，则为查询所有的范围 Set userRoleLimitScope = userRoleServiceApi.findCurrentUserRoleLimitScope(); @@ -107,6 +110,9 @@ public class PermissionAssignServiceImpl implements PermissionAssignService { return; } } + + BusinessLogUtil.addContent("角色绑定权限的相关参数如下：\n", roleBindPermissionRequest); + } @Override diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java index aed515699..efd430e65 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.log.api.util.BusinessLogUtil; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveRoleCallbackApi; import cn.stylefeng.roses.kernel.sys.api.enums.permission.DataScopeTypeEnum; @@ -107,6 +108,9 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl removeWrapper = new LambdaQueryWrapper<>(); removeWrapper.eq(SysRoleDataScope::getRoleId, roleBindDataScopeRequest.getRoleId());