diff --git a/kernel-s-system/system-business-permission/pom.xml b/kernel-s-system/system-business-permission/pom.xml index 21d34586b..5d5de73ac 100644 --- a/kernel-s-system/system-business-permission/pom.xml +++ b/kernel-s-system/system-business-permission/pom.xml @@ -17,6 +17,13 @@ + + + cn.stylefeng.roses + log-api + ${roses.version} + + diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/SysRoleController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/SysRoleController.java index 0a8f9c152..3d0af23ba 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/SysRoleController.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/SysRoleController.java @@ -1,6 +1,7 @@ package cn.stylefeng.roses.kernel.sys.modular.role.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.rule.annotation.BizLog; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -38,6 +39,7 @@ public class SysRoleController { */ @PostResource(name = "添加角色", path = "/sysRole/add", requiredPermission = true, requirePermissionCode = PermissionCodeConstants.ADD_ROLE) + @BizLog(logTypeCode = PermissionCodeConstants.ADD_ROLE) public ResponseData add(@RequestBody @Validated(SysRoleRequest.add.class) SysRoleRequest sysRoleRequest) { sysRoleService.add(sysRoleRequest); return new SuccessResponseData<>(); @@ -51,6 +53,7 @@ public class SysRoleController { */ @PostResource(name = "删除角色", path = "/sysRole/delete", requiredPermission = true, requirePermissionCode = PermissionCodeConstants.DELETE_ROLE) + @BizLog(logTypeCode = PermissionCodeConstants.DELETE_ROLE) public ResponseData delete(@RequestBody @Validated(SysRoleRequest.delete.class) SysRoleRequest sysRoleRequest) { sysRoleService.del(sysRoleRequest); return new SuccessResponseData<>(); @@ -64,6 +67,7 @@ public class SysRoleController { */ @PostResource(name = "批量删除角色", path = "/sysRole/batchDelete", requiredPermission = true, requirePermissionCode = PermissionCodeConstants.DELETE_ROLE) + @BizLog(logTypeCode = PermissionCodeConstants.DELETE_ROLE) public ResponseData batchDelete(@RequestBody @Validated(SysRoleRequest.batchDelete.class) SysRoleRequest sysRoleRequest) { sysRoleService.batchDelete(sysRoleRequest); return new SuccessResponseData<>(); @@ -77,6 +81,7 @@ public class SysRoleController { */ @PostResource(name = "编辑角色", path = "/sysRole/edit", requiredPermission = true, requirePermissionCode = PermissionCodeConstants.EDIT_ROLE) + @BizLog(logTypeCode = PermissionCodeConstants.EDIT_ROLE) public ResponseData edit(@RequestBody @Validated(SysRoleRequest.edit.class) SysRoleRequest sysRoleRequest) { sysRoleService.edit(sysRoleRequest); return new SuccessResponseData<>(); diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java index 984f0a7e0..bd4d24643 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java @@ -9,6 +9,7 @@ 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.entity.BaseEntity; 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.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.sys.api.SysUserRoleServiceApi; @@ -53,6 +54,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl sysRole.setDataScopeType(DataScopeTypeEnum.ALL.getCode()); this.save(sysRole); + + // 添加日志 + BusinessLogUtil.setLogTitle("添加角色,角色名称:", sysRoleRequest.getRoleName()); + BusinessLogUtil.addContent("角色信息详情如下:\n", sysRole); } @Override @@ -74,6 +79,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl // 删除角色 this.baseDelete(CollectionUtil.set(false, sysRole.getRoleId())); + + // 添加日志 + BusinessLogUtil.setLogTitle("删除角色,角色名称:", sysRole.getRoleName()); + BusinessLogUtil.addContent("角色信息详情如下:\n", sysRole); } @Override @@ -102,12 +111,20 @@ public class SysRoleServiceImpl extends ServiceImpl impl // 执行删除角色 this.baseDelete(sysRoleRequest.getRoleIdList()); + + // 添加日志 + BusinessLogUtil.setLogTitle("批量删除角色"); + BusinessLogUtil.addContent("角色id集合如下:\n", sysRoleRequest.getRoleIdList()); } @Override public void edit(SysRoleRequest sysRoleRequest) { SysRole sysRole = this.querySysRole(sysRoleRequest); + // 添加日志 + BusinessLogUtil.setLogTitle("修改角色信息"); + BusinessLogUtil.addContent("原角色信息如下:\n", sysRole); + // 不允许修改角色编码 if (!sysRole.getRoleCode().equals(sysRoleRequest.getRoleCode())) { throw new ServiceException(SysRoleExceptionEnum.SUPER_ADMIN_ROLE_CODE_ERROR); @@ -115,6 +132,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl BeanUtil.copyProperties(sysRoleRequest, sysRole); this.updateById(sysRole); + + BusinessLogUtil.addContent("修改后角色信息如下:\n", sysRole); } @Override