feat(jg): 补充添加设备创建或编辑事件发布功能

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/publisher/EventPublisher.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jg.biz.event.publisher;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/EquipClaimServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -27,7 +28,9 @@ import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.UseRegisterCancelEquipEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
+import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
@@ -147,6 +150,7 @@ public class EquipClaimServiceImpl {
     private final CodeUtil codeUtil;
     private final TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
+    private final EventPublisher eventPublisher;
 
     /**
      * 当前登录人信息
@@ -912,6 +916,9 @@ public class EquipClaimServiceImpl {
         jgRegisterInfoService.saveOrUpdateEquParams(new LinkedHashMap<>(equipInfo), new LinkedHashMap<>(equipParams), equList, record, timestamp, "edit");
         // 更新es
         jgRegisterInfoService.checkEsData(record);
+
+        eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_EQUIP.name(), Sets.newHashSet(record), EquipCreateOrEditEvent.EquipType.equip));
+
     }
 
     /**
@@ -1521,6 +1528,8 @@ public class EquipClaimServiceImpl {
         }
         equipInfo.put(PIPELINE_LIST, pipelineList);
         esEquipmentCategory.saveAll(esEquipmentCategoryList);
+
+        eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_PROJECT.name(), Sets.newHashSet(projectContraption.getSequenceNbr() + ""), EquipCreateOrEditEvent.EquipType.project));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -4711,17 +4711,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         futures.add(CompletableFuture.runAsync(() -> esEquipmentCategory.saveAll(esEquipmentCategoryList), executor));
 
-        futures.add(CompletableFuture.runAsync(() ->
-                eventPublisher.publish(
-                        new EquipCreateOrEditEvent(
-                                this,
-                                BusinessTypeEnum.JG_NEW_EQUIP.name(),
-                                recordSet,
-                                EquipCreateOrEditEvent.EquipType.equip
-                        )
-                ), executor));
-
         CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+        eventPublisher.publish(
+                new EquipCreateOrEditEvent(
+                        this,
+                        BusinessTypeEnum.JG_NEW_EQUIP.name(),
+                        recordSet,
+                        EquipCreateOrEditEvent.EquipType.equip
+                )
+        );
         return String.format("导入完成，成功导入: %d 条数据！", useInfoList.size());
     }
     // 定义线程池，CPU 核数 * 2，避免阻塞主线程