【8.0】【org】更新新增org的监听

kernel-s-system/system-business-hr/pom.xml

@@ -21,6 +21,7 @@
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
             <artifactId>event-spring-boot-starter</artifactId>
+            <version>${roses.version}</version>
         </dependency>
 
         <!--基础核心业务api-->

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

@@ -37,4 +37,9 @@ public interface OrgConstants {
      */
     String NONE_PARENT_ORG = "无上级机构";
 
+    /**
+     * 添加组织机构的事件监听
+     */
+    String ADD_ORG_EVENT = "ADD_ORG_EVENT";
+
 }

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

@@ -1,16 +0,0 @@
-package cn.stylefeng.roses.kernel.sys.modular.org.enums;
-
-/**
- * 添加组织机构的事件
- *
- * @author fengshuonan
- * @since 2023/7/14 14:18
- */
-public enum OrgEventEnums {
-
-    /**
-     * 添加组织机构的事件
-     */
-    ADD_ORG_EVENT
-
-}

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

@@ -2,31 +2,33 @@ package cn.stylefeng.roses.kernel.sys.modular.org.listener;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi;
+import cn.stylefeng.roses.kernel.event.api.annotation.BusinessListener;
+import cn.stylefeng.roses.kernel.sys.modular.org.constants.OrgConstants;
 import cn.stylefeng.roses.kernel.sys.modular.org.entity.HrOrganization;
-import cn.stylefeng.roses.kernel.sys.modular.org.enums.OrgEventEnums;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 /**
- * 添加组织机构的
+ * 添加组织机构的事件监听器
  *
  * @author fengshuonan
  * @since 2023/7/14 14:19
  */
 @Service
-public class AddOrgListener {
+public class OrgOperateListener {
 
     @Resource(name = "sysOrgSubFlagCache")
     private CacheOperatorApi<Boolean> sysOrgSubFlagCache;
 
-    @Override
+    /**
-    public String getBusinessCode() {
+     * 监听新增组织机构，删除相关的缓存
-        return OrgEventEnums.ADD_ORG_EVENT.name();
+     *
-    }
+     * @author fengshuonan
-
+     * @since 2023/7/14 16:22
-    @(OrgEventEnums.ADD_ORG_EVENT)
+     */
-    public void doCallbackAction(HrOrganization businessObject) {
+    @BusinessListener(businessCode = OrgConstants.ADD_ORG_EVENT)
+    public void addOrgCallback(HrOrganization businessObject) {
 
         if (ObjectUtil.isNotEmpty(businessObject.getOrgId())) {
             sysOrgSubFlagCache.remove(String.valueOf(businessObject.getOrgId()));

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

@@ -12,6 +12,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.event.sdk.publish.BusinessEventPublisher;
 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;
@@ -21,7 +22,6 @@ import cn.stylefeng.roses.kernel.sys.api.exception.enums.OrgExceptionEnum;
 import cn.stylefeng.roses.kernel.sys.api.pojo.org.CompanyDeptDTO;
 import cn.stylefeng.roses.kernel.sys.modular.org.constants.OrgConstants;
 import cn.stylefeng.roses.kernel.sys.modular.org.entity.HrOrganization;
-import cn.stylefeng.roses.kernel.sys.modular.org.enums.OrgEventEnums;
 import cn.stylefeng.roses.kernel.sys.modular.org.factory.OrganizationFactory;
 import cn.stylefeng.roses.kernel.sys.modular.org.mapper.HrOrganizationMapper;
 import cn.stylefeng.roses.kernel.sys.modular.org.pojo.request.CommonOrgTreeRequest;
@@ -79,7 +79,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         this.save(hrOrganization);
 
         // 发布一个新增组织机构的事件
-        BusinessEventPublisher.publishEvent(OrgEventEnums.ADD_ORG_EVENT.name(), hrOrganization);
+        BusinessEventPublisher.publishEvent(OrgConstants.ADD_ORG_EVENT, hrOrganization);
     }
 
     @Override
@@ -205,9 +205,8 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
 
         // 根据条件查询组织机构列表
         LambdaQueryWrapper<HrOrganization> wrapper = this.createCommonTreeWrapper(commonOrgTreeRequest);
-        wrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgPids,
+        wrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgPids, HrOrganization::getOrgParentId, HrOrganization::getOrgName,
-                HrOrganization::getOrgParentId, HrOrganization::getOrgName, HrOrganization::getOrgSort,
+                HrOrganization::getOrgSort, HrOrganization::getOrgType);
-                HrOrganization::getOrgType);
         List<HrOrganization> hrOrganizationList = this.list(wrapper);
 
         if (ObjectUtil.isEmpty(hrOrganizationList)) {