update 第三方推送

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -17,6 +17,7 @@ import com.jsowell.adapay.vo.PaymentInfo;
 import com.jsowell.common.YouDianUtils;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
+import com.jsowell.common.constant.mq.ThirdPartyRabbitConstants;
 import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
 import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
@@ -875,23 +876,23 @@ public class OrderService {
         log.info("人工结算订单-end orderCode:{}", dto.getOrderCode());
 
         // 异步推送第三方平台订单信息
-        CompletableFuture.runAsync(() -> {
+//        CompletableFuture.runAsync(() -> {
-            try {
+//            try {
-                commonService.commonPushOrderInfo(orderBasicInfo);
+//                commonService.commonPushOrderInfo(orderBasicInfo);
-            } catch (Exception e) {
+//            } catch (Exception e) {
-                log.error("人工结算订单 推送第三方平台订单信息error, orderCode:{}", orderBasicInfo.getOrderCode(), e);
+//                log.error("人工结算订单 推送第三方平台订单信息error, orderCode:{}", orderBasicInfo.getOrderCode(), e);
-            }
+//            }
-        }, thirdpartyTaskExecutor);
+//        }, thirdpartyTaskExecutor);
 
         // TODO 测试mq
         // 向mq中发送实时数据消息,给第三方服务消费
-//        CompletableFuture.runAsync(() -> {
+        CompletableFuture.runAsync(() -> {
-//            try {
+            try {
-//                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME , ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH ,orderBasicInfo );
+                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME , ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH ,orderBasicInfo );
-//            } catch (Exception e) {
+            } catch (Exception e) {
-//                log.error("向mq中发送实时数据消息供第三方服务消费 error, " , e);
+                log.error("向mq中发送实时数据消息供第三方服务消费 error, " , e);
-//            }
+            }
-//        }, thirdpartyTaskExecutor);
+        }, thirdpartyTaskExecutor);
 
         return true;
     }

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java

@@ -109,54 +109,54 @@ public class RemoteStartChargingRequestHandler extends AbstractYkcHandler {
             orderBasicInfoService.chargingPileStartedSuccessfully(transactionCode);
         }
         // 异步推送第三方平台
-        CompletableFuture.runAsync(() -> {
-            OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
-            if (orderInfo == null) {
-                return;
-            }
-            try {
-                // 启动结果回复
-                commonService.commonPushStartChargeResultV2(orderInfo);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            // 启动失败， 推送第三方订单信息
-            if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
-                try {
-                    Thread.sleep(500);
-                    commonService.commonPushOrderInfoV2(orderInfo);
-                } catch (Exception e) {
-                    log.error("统一推送第三方平台订单信息error, ", e);
-                }
-            }
-        }, thirdpartyTaskExecutor);
-
-        // TODO 测试mq
-        // 异步发送mq
 //        CompletableFuture.runAsync(() -> {
 //            OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
 //            if (orderInfo == null) {
 //                return;
 //            }
 //            try {
-//                // 推送启动充电结果
+//                // 启动结果回复
-//                Thread.sleep(1000);
+//                commonService.commonPushStartChargeResultV2(orderInfo);
-//                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_RESULT_PUSH, orderInfo);
 //            } catch (Exception e) {
 //                e.printStackTrace();
 //            }
 //            // 启动失败， 推送第三方订单信息
 //            if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
 //                try {
-//                    Thread.sleep(1000);
+//                    Thread.sleep(500);
-//                    //充电订单信息推送,订单信息推送,停止充电结果推送,充电账单推送
+//                    commonService.commonPushOrderInfoV2(orderInfo);
-//                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo);
 //                } catch (Exception e) {
 //                    log.error("统一推送第三方平台订单信息error, ", e);
 //                }
 //            }
 //        }, thirdpartyTaskExecutor);
 
+        // TODO 测试mq
+        // 异步发送mq
+        CompletableFuture.runAsync(() -> {
+            OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
+            if (orderInfo == null) {
+                return;
+            }
+            try {
+                // 推送启动充电结果
+                Thread.sleep(1000);
+                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_RESULT_PUSH, orderInfo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            // 启动失败， 推送第三方订单信息
+            if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
+                try {
+                    Thread.sleep(1000);
+                    //充电订单信息推送,订单信息推送,停止充电结果推送,充电账单推送
+                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo);
+                } catch (Exception e) {
+                    log.error("统一推送第三方平台订单信息error, ", e);
+                }
+            }
+        }, thirdpartyTaskExecutor);
+
         return null;
     }
 }

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.google.common.primitives.Bytes;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
+import com.jsowell.common.constant.mq.ThirdPartyRabbitConstants;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
@@ -683,41 +684,41 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
             OrderBasicInfo finalOrderBasicInfo = orderBasicInfo;
 
 //            // TODO 异步推送第三方平台订单信息
-            CompletableFuture.runAsync(() -> {
-                try {
-                    commonService.commonPushOrderInfo(finalOrderBasicInfo);
-                } catch (Exception e) {
-                    log.error("推送第三方平台订单信息error, ", e);
-                }
-            }, thirdpartyTaskExecutor);
-
-            // TODO 异步推送第三方平台订单信息V2
-            CompletableFuture.runAsync(() -> {
-                try {
-                    commonService.commonPushOrderInfoV2(finalOrderBasicInfo);
-                } catch (Exception e) {
-                    log.error("推送第三方平台订单信息error, ", e);
-                }
-            }, thirdpartyTaskExecutor);
-
-            // 异步推送充电订单算法平台
 //            CompletableFuture.runAsync(() -> {
 //                try {
-//                    String result = chargeAlgorithmService.pushOrderInfo(finalOrderBasicInfo.getOrderCode());
+//                    commonService.commonPushOrderInfo(finalOrderBasicInfo);
-//                    log.info("异步推送充电订单算法平台 result:{}", result);
-//                } catch (Exception e) {
-//                    log.error("异步推送充电订单算法平台 error, ", e);
-//                }
-//            }, thirdpartyTaskExecutor);
-//
-//
-//            CompletableFuture.runAsync(() -> {
-//                try {
-//                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH, finalOrderBasicInfo);
 //                } catch (Exception e) {
 //                    log.error("推送第三方平台订单信息error, ", e);
 //                }
 //            }, thirdpartyTaskExecutor);
+//
+//            // TODO 异步推送第三方平台订单信息V2
+//            CompletableFuture.runAsync(() -> {
+//                try {
+//                    commonService.commonPushOrderInfoV2(finalOrderBasicInfo);
+//                } catch (Exception e) {
+//                    log.error("推送第三方平台订单信息error, ", e);
+//                }
+//            }, thirdpartyTaskExecutor);
+
+            // 异步推送充电订单算法平台
+            CompletableFuture.runAsync(() -> {
+                try {
+                    String result = chargeAlgorithmService.pushOrderInfo(finalOrderBasicInfo.getOrderCode());
+                    log.info("异步推送充电订单算法平台 result:{}", result);
+                } catch (Exception e) {
+                    log.error("异步推送充电订单算法平台 error, ", e);
+                }
+            }, thirdpartyTaskExecutor);
+
+
+            CompletableFuture.runAsync(() -> {
+                try {
+                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH, finalOrderBasicInfo);
+                } catch (Exception e) {
+                    log.error("推送第三方平台订单信息error, ", e);
+                }
+            }, thirdpartyTaskExecutor);
 
         } else {
             // 平台没有查到订单

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java

@@ -361,46 +361,46 @@ public class UploadRealTimeMonitorHandler extends AbstractYkcHandler {
         }
 
         // 异步推送第三方平台实时数据V2
-        CompletableFuture.runAsync(() -> {
-            try {
-                commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
-//                log.info("统一推送第三方平台实时数据V2 success, pileSn:{}, connectorCode:{}, connectorStatus:{}, realTimeMonitorData:{}, transactionCode:{}", pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
-            } catch (Exception e) {
-                log.error("统一推送第三方平台实时数据V2 error, ", e);
-            }
-        }, thirdpartyTaskExecutor);
-
-        if (StringUtils.equals(connectorStatus, Constants.ONE)) {
-            // 故障
-            // 异步推送第三方平台告警信息
-            CompletableFuture.runAsync(() -> {
-                try {
-                    commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
-                } catch (Exception e) {
-                    log.error("统一推送第三方平台告警信息 error, ", e);
-                }
-            }, thirdpartyTaskExecutor);
-        }
-
-        // TODO 测试mq
-        // 向mq中发送实时数据消息,给第三方服务消费
 //        CompletableFuture.runAsync(() -> {
 //            try {
-//                log.info("向mq中发送实时数据消息供第三方服务消费, realTimeMonitorData:{}", realTimeMonitorData);
+//                commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
-//                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
+////                log.info("统一推送第三方平台实时数据V2 success, pileSn:{}, connectorCode:{}, connectorStatus:{}, realTimeMonitorData:{}, transactionCode:{}", pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
 //            } catch (Exception e) {
-//                log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
+//                log.error("统一推送第三方平台实时数据V2 error, ", e);
 //            }
+//        }, thirdpartyTaskExecutor);
+//
 //        if (StringUtils.equals(connectorStatus, Constants.ONE)) {
 //            // 故障
 //            // 异步推送第三方平台告警信息
+//            CompletableFuture.runAsync(() -> {
 //                try {
-//                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
+//                    commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
 //                } catch (Exception e) {
 //                    log.error("统一推送第三方平台告警信息 error, ", e);
 //                }
+//            }, thirdpartyTaskExecutor);
 //        }
-//        }, executor);
+
+        // TODO 测试mq
+        // 向mq中发送实时数据消息,给第三方服务消费
+        CompletableFuture.runAsync(() -> {
+            try {
+                log.info("向mq中发送实时数据消息供第三方服务消费, realTimeMonitorData:{}", realTimeMonitorData);
+                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
+            } catch (Exception e){
+                log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
+            }
+            if (StringUtils.equals(connectorStatus,Constants.ONE)){
+                // 故障
+                // 异步推送第三方平台告警信息
+                try {
+                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
+                } catch (Exception e) {
+                    log.error("统一推送第三方平台告警信息 error, ", e);
+                }
+            }
+        }, executor);
 
 
         return null;

jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.google.common.primitives.Bytes;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
+import com.jsowell.common.constant.mq.ThirdPartyRabbitConstants;
 import com.jsowell.common.core.domain.ykc.LoginRequestData;
 import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
@@ -387,53 +388,53 @@ public class PileRabbitListener {
         }
 
 //        // 异步推送第三方平台实时数据
-        CompletableFuture.runAsync(() -> {
-            try {
-                commonService.pushRealTimeInfo(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
-            } catch (Exception e) {
-                log.error("统一推送第三方平台实时数据 error,", e);
-            }
-        }, thirdpartyTaskExecutor);
-
-        // 异步推送第三方平台实时数据V2
-        CompletableFuture.runAsync(() -> {
-            try {
-                commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
-            } catch (Exception e) {
-                log.error("统一推送第三方平台实时数据V2 error, ", e);
-            }
-        }, thirdpartyTaskExecutor);
-
-        if (StringUtils.equals(connectorStatus, Constants.ONE)) {
-            // 故障
-            // 异步推送第三方平台告警信息
-            CompletableFuture.runAsync(() -> {
-                try {
-                    commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
-                } catch (Exception e) {
-                    log.error("统一推送第三方平台告警信息 error, ", e);
-                }
-            }, thirdpartyTaskExecutor);
-        }
-
-        // TODO 测试mq
-        // 向mq中发送实时数据消息,给第三方服务消费
 //        CompletableFuture.runAsync(() -> {
 //            try {
-//                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
+//                commonService.pushRealTimeInfo(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
 //            } catch (Exception e) {
-//                log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
+//                log.error("统一推送第三方平台实时数据 error,", e);
 //            }
+//        }, thirdpartyTaskExecutor);
+//
+//        // 异步推送第三方平台实时数据V2
+//        CompletableFuture.runAsync(() -> {
+//            try {
+//                commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
+//            } catch (Exception e) {
+//                log.error("统一推送第三方平台实时数据V2 error, ", e);
+//            }
+//        }, thirdpartyTaskExecutor);
+//
 //        if (StringUtils.equals(connectorStatus, Constants.ONE)) {
 //            // 故障
 //            // 异步推送第三方平台告警信息
+//            CompletableFuture.runAsync(() -> {
 //                try {
-//                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
+//                    commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
 //                } catch (Exception e) {
 //                    log.error("统一推送第三方平台告警信息 error, ", e);
 //                }
+//            }, thirdpartyTaskExecutor);
 //        }
-//        }, executor);
+
+        // TODO 测试mq
+        // 向mq中发送实时数据消息,给第三方服务消费
+        CompletableFuture.runAsync(() -> {
+            try {
+                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
+            } catch (Exception e){
+                log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
+            }
+            if (StringUtils.equals(connectorStatus,Constants.ONE)){
+                // 故障
+                // 异步推送第三方平台告警信息
+                try {
+                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
+                } catch (Exception e) {
+                    log.error("统一推送第三方平台告警信息 error, ", e);
+                }
+            }
+        }, executor);
 
 
     }

jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java

@@ -112,44 +112,44 @@ public class RemoteStartChargingStrategy implements AbstractYkcStrategy {
         log.info("远程启动充电命令回复-交易流水号:{}, 桩编码:{}, 枪号:{}, 启动结果(00-失败, 01-成功):{}, 失败原因:{}", transactionCode, pileSn, connectorCode, startResult, failedReasonMsg);
 
         // 异步推送第三方平台
-        CompletableFuture.runAsync(() -> {
-            OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
-            if (orderInfo == null) {
-                return;
-            }
-            try {
-                // 启动结果回复
-                commonService.commonPushStartChargeResult(orderInfo);
-
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            // 启动失败， 推送第三方订单信息
-            if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
-                try {
-                    Thread.sleep(500);
-                    commonService.commonPushOrderInfo(orderInfo);
-                } catch (Exception e) {
-                    log.error("统一推送第三方平台订单信息error, ", e);
-                }
-            }
-        }, executor);
-        // Todo 待完善
 //        CompletableFuture.runAsync(() -> {
 //            OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
 //            if (orderInfo == null) {
 //                return;
 //            }
-//            if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)){
+//            try {
+//                // 启动结果回复
+//                commonService.commonPushStartChargeResult(orderInfo);
+//
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
 //            // 启动失败， 推送第三方订单信息
+//            if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) {
 //                try {
 //                    Thread.sleep(500);
-//                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME, ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo);
+//                    commonService.commonPushOrderInfo(orderInfo);
 //                } catch (Exception e) {
 //                    log.error("统一推送第三方平台订单信息error, ", e);
 //                }
 //            }
 //        }, executor);
+        // Todo 待完善
+        CompletableFuture.runAsync(() -> {
+            OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
+            if (orderInfo == null) {
+                return;
+            }
+            if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)){
+                // 启动失败， 推送第三方订单信息
+                try {
+                    Thread.sleep(500);
+                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME, ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo);
+                } catch (Exception e) {
+                    log.error("统一推送第三方平台订单信息error, ", e);
+                }
+            }
+        }, executor);
 
 
         return null;

jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java

@@ -347,53 +347,53 @@ public class UploadRealTimeMonitorStrategy implements AbstractYkcStrategy {
         }
 
 //        // 异步推送第三方平台实时数据
-        CompletableFuture.runAsync(() -> {
-            try {
-                commonService.pushRealTimeInfo(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
-            } catch (Exception e) {
-                log.error("统一推送第三方平台实时数据 error,", e);
-            }
-        }, executor);
-
-        // 异步推送第三方平台实时数据V2
-        CompletableFuture.runAsync(() -> {
-            try {
-                commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
-            } catch (Exception e) {
-                log.error("统一推送第三方平台实时数据V2 error, ", e);
-            }
-        }, executor);
-
-        if (StringUtils.equals(connectorStatus, Constants.ONE)) {
-            // 故障
-            // 异步推送第三方平台告警信息
-            CompletableFuture.runAsync(() -> {
-                try {
-                    commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
-                } catch (Exception e) {
-                    log.error("统一推送第三方平台告警信息 error, ", e);
-                }
-            }, executor);
-        }
-
-        // TODO 测试mq
-        // 向mq中发送实时数据消息,给第三方服务消费
 //        CompletableFuture.runAsync(() -> {
 //            try {
-//                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
+//                commonService.pushRealTimeInfo(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
 //            } catch (Exception e) {
-//                log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
+//                log.error("统一推送第三方平台实时数据 error,", e);
 //            }
+//        }, executor);
+//
+//        // 异步推送第三方平台实时数据V2
+//        CompletableFuture.runAsync(() -> {
+//            try {
+//                commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode);
+//            } catch (Exception e) {
+//                log.error("统一推送第三方平台实时数据V2 error, ", e);
+//            }
+//        }, executor);
+//
 //        if (StringUtils.equals(connectorStatus, Constants.ONE)) {
 //            // 故障
 //            // 异步推送第三方平台告警信息
+//            CompletableFuture.runAsync(() -> {
 //                try {
-//                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
+//                    commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
 //                } catch (Exception e) {
 //                    log.error("统一推送第三方平台告警信息 error, ", e);
 //                }
-//            }
 //            }, executor);
+//        }
+
+        // TODO 测试mq
+        // 向mq中发送实时数据消息,给第三方服务消费
+        CompletableFuture.runAsync(() -> {
+            try {
+                rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData);
+            } catch (Exception e){
+                log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e);
+            }
+            if (StringUtils.equals(connectorStatus,Constants.ONE)){
+                // 故障
+                // 异步推送第三方平台告警信息
+                try {
+                    rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType());
+                } catch (Exception e) {
+                    log.error("统一推送第三方平台告警信息 error, ", e);
+                }
+            }
+        }, executor);
 
         return null;
     }

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java

@@ -477,7 +477,8 @@ public class CommonService {
                                 thirdPartySecretInfoVO.getPlatformType(), e.getMessage(), e);
                     }
                 } else {
-                    log.info("无订单信息，仅推送站点状态，平台类型：{}", thirdPartySecretInfoVO.getPlatformType());
+                    return;
+//                    log.info("无订单信息，仅推送站点状态，平台类型：{}", thirdPartySecretInfoVO.getPlatformType());
                 }
             } catch (Exception e) {
                 log.error("推送实时数据到平台失败，平台类型：{}，错误信息：{}",