Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/factory/QualityScoreUpdateFactory.java

 package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory;
 
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.EquipCreateOrEditEvent;
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.service.IQualityScoreUpdate;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.service.IQualityScoreUpdate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/event/EquipCreateOrEditEvent.java → 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/EquipCreateOrEditEvent.java

-package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event;
+package com.yeejoin.amos.boot.module.jg.biz.reminder.core.event;
 
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
@@ -23,7 +23,7 @@ public class EquipCreateOrEditEvent extends ApplicationEvent {
      */
     private final EquipType equipType;
 
-    public EquipCreateOrEditEvent(Object source, String bizType, Set<String> records, Set<String> updatedIds, EquipType equipType) {
+    public EquipCreateOrEditEvent(Object source, String bizType, Set<String> updatedIds, EquipType equipType) {
         super(source);
         this.bizType = bizType;
         this.updatedIds = updatedIds;

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/EditEventAdapter.java

+package com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.adapter;
+
+import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
+import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class EditEventAdapter {
+
+    private final EventPublisher publisher;
+
+    @TransactionalEventListener
+    @Async
+    public void handleEventAAsync(BaseBizDataChangeEvent eventA) {
+        log.info("receive editEvent handleEventAAsync eventA={}", eventA);
+        publisher.publish(convertToEvent(eventA));
+    }
+
+    private EquipCreateOrEditEvent convertToEvent(BaseBizDataChangeEvent eventA) {
+        return new EquipCreateOrEditEvent(
+                this,
+                eventA.getBizRelationData().getBizType(),
+                eventA.getBizRelationData().getProjectContraptionIds().isEmpty() ? eventA.getBizRelationData().getRecords() : eventA.getBizRelationData().getProjectContraptionIds(),
+                eventA.getBizRelationData().getProjectContraptionIds().isEmpty() ? EquipCreateOrEditEvent.EquipType.equip : 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/reminder/biz/event/listener/EquipOperationEventHandler.java → 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/listener/EquipOperationEventHandler.java

-package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.listener;
+package com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.listener;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.EquipCreateOrEditEvent;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.QualityScoreUpdateFactory;
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.ReminderFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,8 +28,6 @@ public class EquipOperationEventHandler {
     @Value("${equip.opEvent.deal.thread.number:1}")
     private int threadNumber;
 
-    private final ReminderFactory reminderFactory;
-
     private final QualityScoreUpdateFactory qualityScoreUpdateFactory;
 
     private final BlockingQueue<EquipCreateOrEditEvent> queue = new LinkedBlockingQueue<>();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/event/service/IQualityScoreUpdate.java → 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/service/IQualityScoreUpdate.java

-package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.service;
+package com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.service;
 
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.EquipCreateOrEditEvent;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
 
 import java.util.Set;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/event/service/impl/EquipQualityScoreUpdateService.java → 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/service/impl/EquipQualityScoreUpdateService.java

-package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.service.impl;
+package com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.EquipCreateOrEditEvent;
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.service.IQualityScoreUpdate;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.service.IQualityScoreUpdate;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.GradeStrategyFactory;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/event/service/impl/ProjectQualityScoreUpdateService.java → 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/service/impl/ProjectQualityScoreUpdateService.java

-package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.service.impl;
+package com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.EquipCreateOrEditEvent;
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.event.service.IQualityScoreUpdate;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.service.IQualityScoreUpdate;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.GradeStrategyFactory;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;