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/event/listener/CancelAndGradeEventListener.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationAndGradeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.dto.CancelEquipItem;
 import com.yeejoin.amos.boot.module.jg.biz.event.listener.service.ManageStatusDataUpdateService;
-import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,7 +43,6 @@ public class CancelAndGradeEventListener {
     }
 
 
-
     @PostConstruct
     public void init() {
         ExecutorService executorService = Executors.newFixedThreadPool(threadNumber, r -> {
@@ -56,7 +54,7 @@ public class CancelAndGradeEventListener {
             executorService.execute(() -> {
                 while (true) {
                     try {
-                        CancelEquipItem cancelEquipItem  = queue.take();
+                        CancelEquipItem cancelEquipItem = queue.take();
                         log.info("线程 {} 开始处理 cancelEquipItem: {}", Thread.currentThread().getName(), cancelEquipItem);
                         updateService.dealData(cancelEquipItem);
                     } catch (Exception e) {

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

@@ -3518,7 +3518,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             @Override
             public void afterCommit() {
                 // 发布作废事件
-                eventPublisher.publish(new CancellationEvent(this, records));
+                eventPublisher.publish(new CancellationAndGradeEvent(this, records, null));
             }
         });
     }

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

@@ -981,7 +981,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                             .collect(Collectors.toList())
             );
             // 车用气瓶评分
-            eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_USAGE_REGISTRATION.name(), Sets.newHashSet(equipIdList), EquipCreateOrEditEvent.EquipType.equip));
+            eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.name(), Sets.newHashSet(equipIdList), EquipCreateOrEditEvent.EquipType.equip));
         }
         this.getBaseMapper().updateById(jgVehicleInformation);
         commonService.saveExecuteFlowData2Redis(jgVehicleInformation.getInstanceId(), this.buildInstanceRuntimeData(jgVehicleInformation));