feat(综合搜索)：增量数据同步调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/core/DefaultEventPublisher.java

-package com.yeejoin.amos.boot.module.jg.biz.edit.core;
-
-import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
-import lombok.Getter;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.ApplicationEventPublisherAware;
-import org.springframework.stereotype.Component;
-
-@Getter
-@Component("defaultEventPublisher")
-public class DefaultEventPublisher implements IEventPublisher<BaseBizDataChangeEvent>, ApplicationEventPublisherAware {
-
-    private ApplicationEventPublisher publisher;
-
-    @Override
-    public void publish(BaseBizDataChangeEvent event) {
-        publisher.publishEvent(event);
-    }
-
-    @Override
-    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
-        this.publisher = applicationEventPublisher;
-    }
-
-}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/core/EventPublisherMapping.java

-package com.yeejoin.amos.boot.module.jg.biz.edit.core;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface EventPublisherMapping {
-    String value() default "defaultEventPublisher";
-}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/core/IEventPublisher.java

-package com.yeejoin.amos.boot.module.jg.biz.edit.core;
-
-import org.springframework.context.ApplicationEvent;
-
-public interface IEventPublisher<T extends ApplicationEvent> {
-    void publish(T event);
-}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/core/RouterEventPublisher.java

-package com.yeejoin.amos.boot.module.jg.biz.edit.core;
-
-import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Component
-@RequiredArgsConstructor
-public class RouterEventPublisher implements IEventPublisher<BaseBizDataChangeEvent> {
-
-    private final ApplicationContext applicationContext;
-
-    private final Map<Class<?>, String> publisherCache = new ConcurrentHashMap<>();
-
-    @Override
-    public void publish(BaseBizDataChangeEvent event) {
-        String publisherName = resolvePublisherName(event.getClass());
-        IEventPublisher<BaseBizDataChangeEvent> publisher = applicationContext.getBean(publisherName, IEventPublisher.class);
-        Optional.ofNullable(publisher).orElseGet(this::getDefaultPublisher).publish(event);
-    }
-
-
-    private String resolvePublisherName(Class<?> eventClass) {
-        return publisherCache.computeIfAbsent(eventClass, clz -> {
-            EventPublisherMapping annotation = clz.getAnnotation(EventPublisherMapping.class);
-            return (annotation != null) ? annotation.value() : "defaultEventPublisher";
-        });
-    }
-
-    private IEventPublisher<BaseBizDataChangeEvent> getDefaultPublisher() {
-        return applicationContext.getBean("defaultEventPublisher", IEventPublisher.class);
-    }
-}

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.event;
 
 import com.yeejoin.amos.boot.module.jg.api.dto.BizRelationDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.EventPublisherMapping;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 import org.typroject.tyboot.core.foundation.context.RequestContextModel;
@@ -13,7 +12,6 @@ import java.util.List;
  * @author Administrator
  */
 @Getter
-@EventPublisherMapping
 public class BaseBizDataChangeEvent extends ApplicationEvent {
 
     private final List<FieldChangeMeta> data;

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

+package com.yeejoin.amos.boot.module.jg.biz.edit.event;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.BizRelationDataDto;
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+import org.typroject.tyboot.core.foundation.context.RequestContextModel;
+
+/**
+ * @author Administrator
+ */
+@Getter
+public class EmptyDataChangeEvent extends ApplicationEvent {
+
+    private final RequestContextModel requestContext;
+
+    private final BizRelationDataDto bizRelationData;
+
+    public EmptyDataChangeEvent(Object source, BizRelationDataDto bizRelationData, RequestContextModel requestContext) {
+        super(source);
+        this.bizRelationData = bizRelationData;
+        this.requestContext = requestContext;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/DefaultBizDataChangeHandler.java

@@ -4,13 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.BizRelationDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipDataProcessStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.controller.BizDataChangeController;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.IEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
+import com.yeejoin.amos.boot.module.jg.biz.edit.event.EmptyDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.HandleResult;
@@ -18,6 +19,7 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.strategy.IEquipCha
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgBizChangeLogServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
@@ -31,10 +33,11 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
 
     public static String TEMPORARY_PIPELINES_DATA = "temporaryPipelinesData";
 
-    private final IEventPublisher<BaseBizDataChangeEvent> eventPublisher;
+    private final CommonPublisher eventPublisher;
+
     private final ApplicationContext applicationContext;
 
-    protected DefaultBizDataChangeHandler(IEventPublisher<BaseBizDataChangeEvent> eventPublisher, ApplicationContext applicationContext) {
+    protected DefaultBizDataChangeHandler(CommonPublisher eventPublisher, ApplicationContext applicationContext) {
         this.eventPublisher = eventPublisher;
         this.applicationContext = applicationContext;
     }
@@ -86,19 +89,21 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
     private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo, JSONObject oData, ReginParams selectedOrgInfo) {
         // 重复行数据不记录日志（如行政区划编码、行政区划名称，只记录一个字段即可）
         List<FieldChangeMeta> noPeatChangeFields = allChangeColumns.stream().filter(f -> !f.getIsRepeatColumn()).collect(Collectors.toList());
+        BizRelationDataDto bizRelationDataDto = new BizRelationDataDto();
+        bizRelationDataDto.setBizId(applyNo);
+        bizRelationDataDto.setBizType(canHandleBizType());
+        bizRelationDataDto.setRecords(getEqs(applyNo));
+        bizRelationDataDto.setChangeReason(oData.getString("changeReason"));
+        bizRelationDataDto.setChangeAttachment(oData.get("changeAttachment") != null ? JSONObject.toJSONString(oData.get("changeAttachment")) : null);
+        bizRelationDataDto.setProjectContraptionIds(getProjectContraptionIds(applyNo));
+        bizRelationDataDto.setRecUserName(selectedOrgInfo.getUserModel().getRealName());
+        bizRelationDataDto.setUnitCode(selectedOrgInfo.getCompany().getCompanyCode());
+        bizRelationDataDto.setUnitName(selectedOrgInfo.getCompany().getCompanyName());
+        bizRelationDataDto.setBizIsFinished(bizIsFinished(applyNo));
         if (!noPeatChangeFields.isEmpty()) {
-            BizRelationDataDto bizRelationDataDto = new BizRelationDataDto();
-            bizRelationDataDto.setBizId(applyNo);
-            bizRelationDataDto.setBizType(canHandleBizType());
-            bizRelationDataDto.setRecords(getEqs(applyNo));
-            bizRelationDataDto.setChangeReason(oData.getString("changeReason"));
-            bizRelationDataDto.setChangeAttachment(oData.get("changeAttachment") != null ? JSONObject.toJSONString(oData.get("changeAttachment")) : null);
-            bizRelationDataDto.setProjectContraptionIds(getProjectContraptionIds(applyNo));
-            bizRelationDataDto.setRecUserName(selectedOrgInfo.getUserModel().getRealName());
-            bizRelationDataDto.setUnitCode(selectedOrgInfo.getCompany().getCompanyCode());
-            bizRelationDataDto.setUnitName(selectedOrgInfo.getCompany().getCompanyName());
-            bizRelationDataDto.setBizIsFinished(bizIsFinished(applyNo));
             eventPublisher.publish(new BaseBizDataChangeEvent(this, bizRelationDataDto, noPeatChangeFields, RequestContext.cloneRequestContext()));
+        } else {
+            eventPublisher.publish(new EmptyDataChangeEvent(this, bizRelationDataDto, RequestContext.cloneRequestContext()));
         }
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/changeRegistrationReform/ChangeRegistrationReformDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.changeRegistrationR
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class ChangeRegistrationReformDataChangeHandler extends DefaultBizDataCha
 
     private final ChangeRegistrationReformEditUpdateService changeRegistrationReformEditUpdateService;
 
-    protected ChangeRegistrationReformDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, ChangeRegistrationReformEditUpdateService changeRegistrationReformEditUpdateService) {
+    protected ChangeRegistrationReformDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, ChangeRegistrationReformEditUpdateService changeRegistrationReformEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.changeRegistrationReformEditUpdateService = changeRegistrationReformEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/changeRegistrationTransfer/ChangeRegistrationTransferDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.changeRegistrationT
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class ChangeRegistrationTransferDataChangeHandler extends DefaultBizDataC
 
     private final ChangeRegistrationTransferEditUpdateService changeRegistrationTransferEditUpdateService;
 
-    protected ChangeRegistrationTransferDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, ChangeRegistrationTransferEditUpdateService changeRegistrationTransferEditUpdateService) {
+    protected ChangeRegistrationTransferDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, ChangeRegistrationTransferEditUpdateService changeRegistrationTransferEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.changeRegistrationTransferEditUpdateService = changeRegistrationTransferEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/changeRegistrationUnit/ChangeRegistrationUnitDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.changeRegistrationU
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class ChangeRegistrationUnitDataChangeHandler extends DefaultBizDataChang
 
     private final ChangeRegistrationUnitEditUpdateService changeRegistrationUnitEditUpdateService;
 
-    protected ChangeRegistrationUnitDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, ChangeRegistrationUnitEditUpdateService changeRegistrationUnitEditUpdateService) {
+    protected ChangeRegistrationUnitDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, ChangeRegistrationUnitEditUpdateService changeRegistrationUnitEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.changeRegistrationUnitEditUpdateService = changeRegistrationUnitEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/changeVehicleRegistrationUnit/ChangeVehicleRegistrationUnitDataChangeHandler.java

 package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.changeVehicleRegistrationUnit;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class ChangeVehicleRegistrationUnitDataChangeHandler extends DefaultBizDa
 
     private final ChangeVehicleRegistrationUnitEditUpdateService changeVehicleRegistrationUnitEditUpdateService;
 
-    protected ChangeVehicleRegistrationUnitDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, ChangeVehicleRegistrationUnitEditUpdateService changeVehicleRegistrationUnitEditUpdateService) {
+    protected ChangeVehicleRegistrationUnitDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, ChangeVehicleRegistrationUnitEditUpdateService changeVehicleRegistrationUnitEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.changeVehicleRegistrationUnitEditUpdateService = changeVehicleRegistrationUnitEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/enableDisable/EnableDisableDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.enableDisable;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisable;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class EnableDisableDataChangeHandler extends DefaultBizDataChangeHandler<
 
     private final EnableDisableEditUpdateService enableDisableEditUpdateService;
 
-    protected EnableDisableDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, EnableDisableEditUpdateService enableDisableEditUpdateService) {
+    protected EnableDisableDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, EnableDisableEditUpdateService enableDisableEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.enableDisableEditUpdateService = enableDisableEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/equipTransfer/EquipTransferDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.equipTransfer;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class EquipTransferDataChangeHandler extends DefaultBizDataChangeHandler<
 
     private final EquipTransferEditUpdateService equipTransferEditUpdateService;
 
-    protected EquipTransferDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, EquipTransferEditUpdateService equipTransferEditUpdateService) {
+    protected EquipTransferDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, EquipTransferEditUpdateService equipTransferEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.equipTransferEditUpdateService = equipTransferEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/installNotice/InstallNoticeDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.installNotice;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -23,7 +23,7 @@ public class InstallNoticeDataChangeHandler extends DefaultBizDataChangeHandler<
 
     private final InstallNoticeEditUpdateService installNoticeEditUpdateService;
 
-    protected InstallNoticeDataChangeHandler(InstallNoticeEditUpdateService installNoticeEditUpdateService, RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext) {
+    protected InstallNoticeDataChangeHandler(InstallNoticeEditUpdateService installNoticeEditUpdateService, CommonPublisher routerEventPublisher, ApplicationContext applicationContext) {
         super(routerEventPublisher, applicationContext);
         this.installNoticeEditUpdateService = installNoticeEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/maintainNotice/MaintainNoticeDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.maintainNotice;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -28,7 +28,7 @@ public class MaintainNoticeDataChangeHandler extends DefaultBizDataChangeHandler
 
     private final MaintainNoticeEditUpdateService maintainNoticeEditUpdateService;
 
-    protected MaintainNoticeDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, MaintainNoticeEditUpdateService maintainNoticeEditUpdateService) {
+    protected MaintainNoticeDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, MaintainNoticeEditUpdateService maintainNoticeEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.maintainNoticeEditUpdateService = maintainNoticeEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/maintenanceContract/MaintenanceContractDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.maintenanceContract
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class MaintenanceContractDataChangeHandler extends DefaultBizDataChangeHa
 
     private final MaintenanceContractEditUpdateService maintenanceContractEditUpdateService;
 
-    protected MaintenanceContractDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, MaintenanceContractEditUpdateService maintenanceContractEditUpdateService) {
+    protected MaintenanceContractDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, MaintenanceContractEditUpdateService maintenanceContractEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.maintenanceContractEditUpdateService = maintenanceContractEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/newEquip/NewEquipDataChangeHandler.java

 package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.newEquip;
 
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import org.springframework.context.ApplicationContext;
@@ -20,7 +20,7 @@ import java.util.Set;
 @Component
 public class NewEquipDataChangeHandler extends DefaultBizDataChangeHandler<BaseBizDataChangeEvent> {
 
-    protected NewEquipDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext) {
+    protected NewEquipDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext) {
         super(routerEventPublisher, applicationContext);
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/newProject/NewProjectDataChangeHandler.java

 package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.newProject;
 
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import org.springframework.context.ApplicationContext;
@@ -19,7 +19,7 @@ public class NewProjectDataChangeHandler extends DefaultBizDataChangeHandler<Bas
 
     private final NewProjectEditUpdateService newProjectEditUpdateService;
 
-    protected NewProjectDataChangeHandler(NewProjectEditUpdateService newProjectEditUpdateService, RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext) {
+    protected NewProjectDataChangeHandler(NewProjectEditUpdateService newProjectEditUpdateService, CommonPublisher routerEventPublisher, ApplicationContext applicationContext) {
         super(routerEventPublisher, applicationContext);
         this.newProjectEditUpdateService = newProjectEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/reformNotice/ReformNoticeDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.reformNotice;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -23,7 +23,7 @@ public class ReformNoticeDataChangeHandler extends DefaultBizDataChangeHandler<B
 
     private final ReformNoticeEditUpdateService reformNoticeEditUpdateService;
 
-    protected ReformNoticeDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, ReformNoticeEditUpdateService reformNoticeEditUpdateService) {
+    protected ReformNoticeDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, ReformNoticeEditUpdateService reformNoticeEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.reformNoticeEditUpdateService = reformNoticeEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/scrapCancel/ScrapCancelDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.scrapCancel;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class ScrapCancelDataChangeHandler extends DefaultBizDataChangeHandler<Ba
 
     private final ScrapCancelEditUpdateService scrapCancelEditUpdateService;
 
-    protected ScrapCancelDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, ScrapCancelEditUpdateService scrapCancelEditUpdateService) {
+    protected ScrapCancelDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, ScrapCancelEditUpdateService scrapCancelEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.scrapCancelEditUpdateService = scrapCancelEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/transferNotice/TransferNoticeDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.transferNotice;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class TransferNoticeDataChangeHandler extends DefaultBizDataChangeHandler
 
     private final TransferNoticeEditUpdateService transferNoticeEditUpdateService;
 
-    protected TransferNoticeDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, TransferNoticeEditUpdateService transferNoticeEditUpdateService) {
+    protected TransferNoticeDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, TransferNoticeEditUpdateService transferNoticeEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.transferNoticeEditUpdateService = transferNoticeEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterDataChangeHandler.java

@@ -2,12 +2,12 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -30,7 +30,7 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
 
     private final UseRegisterUpdateService useRegisterUpdateService;
 
-    protected UseRegisterDataChangeHandler(RouterEventPublisher routerEventPublisher, UseRegisterUpdateService useRegisterUpdateService, ApplicationContext applicationContext) {
+    protected UseRegisterDataChangeHandler(CommonPublisher routerEventPublisher, UseRegisterUpdateService useRegisterUpdateService, ApplicationContext applicationContext) {
         super(routerEventPublisher, applicationContext);
         this.useRegisterUpdateService = useRegisterUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/vehicleInformation/VehicleInformationDataChangeHandler.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.vehicleInformation;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -26,7 +26,7 @@ public class VehicleInformationDataChangeHandler extends DefaultBizDataChangeHan
 
     private final VehicleInformationEditUpdateService vehicleInformationEditUpdateService;
 
-    protected VehicleInformationDataChangeHandler(RouterEventPublisher routerEventPublisher, ApplicationContext applicationContext, VehicleInformationEditUpdateService vehicleInformationEditUpdateService) {
+    protected VehicleInformationDataChangeHandler(CommonPublisher routerEventPublisher, ApplicationContext applicationContext, VehicleInformationEditUpdateService vehicleInformationEditUpdateService) {
         super(routerEventPublisher, applicationContext);
         this.vehicleInformationEditUpdateService = vehicleInformationEditUpdateService;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java

@@ -38,8 +38,6 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
 
     private final EsUpdateService esUpdateService;
 
-    private final CommonPublisher publisher;
-
 
     @Override
     public HandleResult handle(Map<String, Object> changeData, String record) {
@@ -145,8 +143,6 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
         this.updateOtherEquipInSameCert(useInfoNew, registerInfoNew, registerInfoOld, allChangeColumns);
         // 设备技术参数入库处理
         commonEquipDataProcessService.updateTechParamInfo(registerInfoOld.getEquList(), record, changeData, allChangeColumns);
-        // 发送数据刷新消息
-        publisher.publish(new DataRefreshEvent(this, Collections.singletonList(record), DataRefreshEvent.DataType.equipment.name(), DataRefreshEvent.Operation.UPDATE));
         return HandleResult.builder().fieldChangeMetas(allChangeColumns).build();
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleProjectEquipChangeProcess.java

@@ -47,8 +47,6 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
 
     private final EsUpdateService esUpdateService;
 
-    private final CommonPublisher publisher;
-
 
     @Override
     public HandleResult handle(Map<String, Object> changeData, String projectContraptionId) {
@@ -120,15 +118,9 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
         pieLineDataChangeService.updateEs(projectContraptionChangeDataDto);
         // 5.更新管道长度，按照装置下的已经入库的全量更新（todo 流程中编辑时数据不体现在这 还是原数据）
         pieLineDataChangeService.updatePipelineLength(projectContraptionChangeDataDto.getProjectContraptionId());
-        this.sendDataRefreshMsgProjectContraption(pmap.values());
         return HandleResult.builder().fieldChangeMetas(allChangeColumns).pipelineChangeItemMap(pmap).build();
     }
 
-    private void sendDataRefreshMsgProjectContraption(Collection<List<PipelineChangeItemDto>> values) {
-        List<String> records = values.stream().flatMap(Collection::stream).collect(Collectors.toList()).stream().map(TechParamsPipelineChangeFieldDto::getRecord).collect(Collectors.toList());
-        publisher.publish(new DataRefreshEvent(this, records, DataRefreshEvent.DataType.equipment.name(), DataRefreshEvent.Operation.UPDATE));
-    }
-
 
     private void buildTechParamChangeLog(String record, PipelineChangeItemDto pipelineNew, PipelineChangeItemDto pipelineOld, ProjectContraptionChangeDataDto projectContraptionChangeDataDto, List<FieldChangeMeta> allChangeColumns) {
         TechParamsPipelineChangeFieldDto paramsPipelineChangeFieldNew = new TechParamsPipelineChangeFieldDto();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/event/adapter/BizDataChange2EditEventAdapter.java

@@ -18,7 +18,7 @@ public class BizDataChange2EditEventAdapter {
 
     private final ApplicationEventPublisher publisher;
 
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT, value = {BaseBizDataChangeEvent.class})
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void handleEventAsync(BaseBizDataChangeEvent event) {
         log.info("receive editEvent handleEventAAsync eventA={}", event);