【8.0.1】【system】增加机构信息的日志

kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrganizationController.java

@@ -1,6 +1,7 @@
 package cn.stylefeng.roses.kernel.sys.modular.org.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;
@@ -38,6 +39,7 @@ public class HrOrganizationController {
      */
     @PostResource(name = "添加组织机构", path = "/hrOrganization/add", requiredPermission = true,
             requirePermissionCode = PermissionCodeConstants.ADD_ORG)
+    @BizLog(logTypeCode = PermissionCodeConstants.ADD_ORG)
     public ResponseData<HrOrganization> add(
             @RequestBody @Validated(HrOrganizationRequest.add.class) HrOrganizationRequest hrOrganizationRequest) {
         hrOrganizationService.add(hrOrganizationRequest);
@@ -52,6 +54,7 @@ public class HrOrganizationController {
      */
     @PostResource(name = "删除组织机构", path = "/hrOrganization/delete", requiredPermission = true,
             requirePermissionCode = PermissionCodeConstants.DELETE_ORG)
+    @BizLog(logTypeCode = PermissionCodeConstants.DELETE_ORG)
     public ResponseData<?> delete(@RequestBody @Validated(HrOrganizationRequest.delete.class) HrOrganizationRequest hrOrganizationRequest) {
         hrOrganizationService.del(hrOrganizationRequest);
         return new SuccessResponseData<>();
@@ -65,6 +68,7 @@ public class HrOrganizationController {
      */
     @PostResource(name = "批量删除组织机构", path = "/hrOrganization/batchDelete", requiredPermission = true,
             requirePermissionCode = PermissionCodeConstants.DELETE_ORG)
+    @BizLog(logTypeCode = PermissionCodeConstants.DELETE_ORG)
     public ResponseData<?> batchDelete(@RequestBody @Validated(BaseRequest.batchDelete.class) HrOrganizationRequest hrOrganizationRequest) {
         hrOrganizationService.batchDelete(hrOrganizationRequest);
         return new SuccessResponseData<>();
@@ -78,6 +82,7 @@ public class HrOrganizationController {
      */
     @PostResource(name = "编辑组织机构", path = "/hrOrganization/edit", requiredPermission = true,
             requirePermissionCode = PermissionCodeConstants.EDIT_ORG)
+    @BizLog(logTypeCode = PermissionCodeConstants.EDIT_ORG)
     public ResponseData<?> edit(@RequestBody @Validated(HrOrganizationRequest.edit.class) HrOrganizationRequest hrOrganizationRequest) {
         hrOrganizationService.edit(hrOrganizationRequest);
         return new SuccessResponseData<>();

kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java

@@ -14,6 +14,7 @@ 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.event.sdk.publish.BusinessEventPublisher;
+import cn.stylefeng.roses.kernel.log.api.util.BusinessLogUtil;
 import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory;
@@ -84,6 +85,10 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
 
         // 发布一个新增组织机构的事件
         BusinessEventPublisher.publishEvent(OrgConstants.ADD_ORG_EVENT, hrOrganization);
+
+        // 记录日志
+        BusinessLogUtil.setLogTitle("添加机构，机构名称：" + hrOrganizationRequest.getOrgName());
+        BusinessLogUtil.addContent("新增的机构详情如下：\n", hrOrganization);
     }
 
     @Override
@@ -100,6 +105,10 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
 
         // 发布删除机构的事件
         BusinessEventPublisher.publishEvent(OrgConstants.DELETE_ORG_EVENT, null);
+
+        // 记录日志
+        BusinessLogUtil.setLogTitle("删除机构，机构ID：" + hrOrganizationRequest.getOrgId());
+        BusinessLogUtil.addContent("删除机构，机构ID：", hrOrganizationRequest.getOrgId());
     }
 
     @Override
@@ -120,11 +129,19 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
 
         // 发布删除机构的事件
         BusinessEventPublisher.publishEvent(OrgConstants.DELETE_ORG_EVENT, null);
+
+        // 记录日志
+        BusinessLogUtil.setLogTitle("批量删除机构");
+        BusinessLogUtil.addContent("批量删除机构，id集合为：", orgIdList);
     }
 
     @Override
     public void edit(HrOrganizationRequest hrOrganizationRequest) {
         HrOrganization hrOrganization = this.queryHrOrganization(hrOrganizationRequest);
+
+        BusinessLogUtil.setLogTitle("更新机构信息，机构名称为：", hrOrganization.getOrgName());
+        BusinessLogUtil.addContent("更新前的机构信息为：\n", hrOrganization);
+
         BeanUtil.copyProperties(hrOrganizationRequest, hrOrganization);
 
         // 填充父级parentIds
@@ -135,6 +152,9 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         // 发布编辑机构事件
         BusinessEventPublisher.publishEvent(OrgConstants.EDIT_ORG_EVENT, null);
 
+        // 记录日志
+        BusinessLogUtil.addContent("更新后的机构信息为：\n", hrOrganization);
+
     }
 
     @Override