diff --git a/kernel-s-system/system-business-hr/pom.xml b/kernel-s-system/system-business-hr/pom.xml
index af5a6ec43..cbd951473 100644
--- a/kernel-s-system/system-business-hr/pom.xml
+++ b/kernel-s-system/system-business-hr/pom.xml
@@ -63,6 +63,13 @@
${roses.version}
+
+
+ cn.stylefeng.roses
+ log-api
+ ${roses.version}
+
+
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserController.java
index b20ae7f5c..eb7e44fc6 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserController.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserController.java
@@ -1,6 +1,7 @@
package cn.stylefeng.roses.kernel.sys.modular.user.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.request.BaseRequest;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
@@ -43,6 +44,7 @@ public class SysUserController {
*/
@PostResource(name = "添加用户", path = "/sysUser/add", requiredPermission = true,
requirePermissionCode = PermissionCodeConstants.ADD_USER)
+ @BizLog(logTypeCode = PermissionCodeConstants.ADD_USER)
public ResponseData add(@RequestBody @Validated(SysUserRequest.add.class) SysUserRequest sysUserRequest) {
sysUserService.add(sysUserRequest);
return new SuccessResponseData<>();
@@ -56,6 +58,7 @@ public class SysUserController {
*/
@PostResource(name = "删除用户", path = "/sysUser/delete", requiredPermission = true,
requirePermissionCode = PermissionCodeConstants.DELETE_USER)
+ @BizLog(logTypeCode = PermissionCodeConstants.DELETE_USER)
public ResponseData> delete(@RequestBody @Validated(SysUserRequest.delete.class) SysUserRequest sysUserRequest) {
sysUserService.del(sysUserRequest);
return new SuccessResponseData<>();
@@ -69,6 +72,7 @@ public class SysUserController {
*/
@PostResource(name = "批量删除用户", path = "/sysUser/batchDelete", requiredPermission = true,
requirePermissionCode = PermissionCodeConstants.DELETE_USER)
+ @BizLog(logTypeCode = PermissionCodeConstants.DELETE_USER)
public ResponseData> batchDelete(@RequestBody @Validated(BaseRequest.batchDelete.class) SysUserRequest sysUserRequest) {
sysUserService.batchDel(sysUserRequest);
return new SuccessResponseData<>();
@@ -82,6 +86,7 @@ public class SysUserController {
*/
@PostResource(name = "编辑用户", path = "/sysUser/edit", requiredPermission = true,
requirePermissionCode = PermissionCodeConstants.EDIT_USER)
+ @BizLog(logTypeCode = PermissionCodeConstants.EDIT_USER)
public ResponseData> edit(@RequestBody @Validated(SysUserRequest.edit.class) SysUserRequest sysUserRequest) {
sysUserService.edit(sysUserRequest);
return new SuccessResponseData<>();
@@ -117,6 +122,7 @@ public class SysUserController {
*/
@PostResource(name = "修改用户状态", path = "/sysUser/updateStatus", requiredPermission = true,
requirePermissionCode = PermissionCodeConstants.UPDATE_USER_STATUS)
+ @BizLog(logTypeCode = PermissionCodeConstants.UPDATE_USER_STATUS)
public ResponseData> updateStatus(@RequestBody @Validated(SysUserRequest.updateStatus.class) SysUserRequest sysUserRequest) {
sysUserService.updateStatus(sysUserRequest);
return new SuccessResponseData<>();
@@ -130,6 +136,7 @@ public class SysUserController {
*/
@PostResource(name = "绑定用户角色", path = "/sysUser/bindRoles", requiredPermission = true,
requirePermissionCode = PermissionCodeConstants.ASSIGN_USER_ROLE)
+ @BizLog(logTypeCode = PermissionCodeConstants.ASSIGN_USER_ROLE)
public ResponseData> bindRoles(@RequestBody @Validated(SysUserRoleRequest.bindRoles.class) SysUserRoleRequest sysUserRoleRequest) {
sysUserRoleService.bindRoles(sysUserRoleRequest);
return new SuccessResponseData<>();
@@ -143,6 +150,7 @@ public class SysUserController {
*/
@PostResource(name = "重置用户密码", path = "/sysUser/resetPassword", requiredPermission = true,
requirePermissionCode = PermissionCodeConstants.RESET_PASSWORD)
+ @BizLog(logTypeCode = PermissionCodeConstants.RESET_PASSWORD)
public ResponseData> resetPassword(@RequestBody @Validated(SysUserRequest.resetPassword.class) SysUserRequest sysUserRequest) {
sysUserService.resetPassword(sysUserRequest);
return new SuccessResponseData<>();
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java
index e89856322..0460e1e25 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi;
import cn.stylefeng.roses.kernel.event.sdk.publish.BusinessEventPublisher;
+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.SysRoleLimitServiceApi;
import cn.stylefeng.roses.kernel.sys.api.SysRoleServiceApi;
@@ -79,6 +80,10 @@ public class SysUserRoleServiceImpl extends ServiceImpl impl
// 添加用户一个默认角色
sysUserRoleService.bindUserDefaultRole(sysUser.getUserId());
+
+ // 记录日志
+ BusinessLogUtil.setLogTitle("新增用户");
+ BusinessLogUtil.addContent("新增用户账号信息:", sysUser.getAccount());
+ BusinessLogUtil.addContent("用户详细信息如下:\n", sysUser);
}
@Override
@@ -120,6 +126,11 @@ public class SysUserServiceImpl extends ServiceImpl impl
// 删除用户的业务操作
this.baseRemoveUser(CollectionUtil.set(false, sysUser.getUserId()));
+
+ // 记录日志
+ BusinessLogUtil.setLogTitle("删除用户");
+ BusinessLogUtil.addContent("新增用户账号信息:", sysUser.getAccount());
+ BusinessLogUtil.addContent("用户详细信息:\n", sysUser);
}
@Override
@@ -138,11 +149,19 @@ public class SysUserServiceImpl extends ServiceImpl impl
// 删除用户的业务操作
this.baseRemoveUser(userIdList);
+
+ // 记录日志
+ BusinessLogUtil.setLogTitle("批量删除用户");
+ BusinessLogUtil.addContent("用户id集合为:\n", userIdList);
}
@Override
public void edit(SysUserRequest sysUserRequest) {
+
+ BusinessLogUtil.setLogTitle("更新用户信息");
+
SysUser sysUser = this.querySysUser(sysUserRequest);
+ BusinessLogUtil.addContent("原始用户信息如下:\n", sysUser);
// 不能修改admin账号的超级管理员标识和账号
if (SysConstants.ADMIN_USER_ACCOUNT.equals(sysUser.getAccount())) {
@@ -165,6 +184,9 @@ public class SysUserServiceImpl extends ServiceImpl impl
// 更新用户的任职信息
sysUserOrgService.updateUserOrg(sysUser.getUserId(), sysUserRequest.getUserOrgList());
+
+ // 记录日志
+ BusinessLogUtil.addContent("更新后用户信息如下:\n", sysUser);
}
@Override
@@ -246,6 +268,11 @@ public class SysUserServiceImpl extends ServiceImpl impl
loginErrorCountCacheApi.remove(sysUser.getAccount());
}
}
+
+ // 记录日志
+ BusinessLogUtil.setLogTitle("更新用户状态");
+ BusinessLogUtil.addContent("用户id:", sysUserRequest.getUserId());
+ BusinessLogUtil.addContent("修改状态为:", sysUserRequest.getStatusFlag());
}
@Override
@@ -262,6 +289,10 @@ public class SysUserServiceImpl extends ServiceImpl impl
sysUser.setPasswordSalt(saltedEncryptResult.getPasswordSalt());
this.updateById(sysUser);
+
+ // 记录日志
+ BusinessLogUtil.setLogTitle("重置用户密码");
+ BusinessLogUtil.addContent("用户信息如下:\n", sysUser);
}
@Override