From 9156fe16dcd9a9d9cf6aee0d5e81d788cfb96b80 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Fri, 12 Sep 2025 14:48:38 +0800 Subject: [PATCH] update --- .../src/main/java/com/jsowell/service/OrderService.java | 2 +- .../yunkuaichong/RemoteStartChargingRequestHandler.java | 4 ++-- .../yunkuaichong/TransactionRecordsRequestHandler.java | 2 +- .../handler/yunkuaichong/UploadRealTimeMonitorHandler.java | 5 +++-- .../jsowell/netty/service/rabbitmq/PileRabbitListener.java | 4 ++-- .../netty/strategy/ykc/RemoteStartChargingStrategy.java | 2 +- .../netty/strategy/ykc/UploadRealTimeMonitorStrategy.java | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 4c8874625..2d27a1877 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -822,7 +822,7 @@ public class OrderService { // 向mq中发送实时数据消息,给第三方服务消费 CompletableFuture.runAsync(() -> { try { - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME , ThirdPartyRabbitConstants.QUEUE_CHARGE_ORDER_PUSH ,orderBasicInfo ); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME , ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH ,orderBasicInfo ); } catch (Exception e) { log.error("向mq中发送实时数据消息供第三方服务消费 error, " , e); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java index aa48bf15d..e2cdd1c57 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java @@ -141,7 +141,7 @@ public class RemoteStartChargingRequestHandler extends AbstractYkcHandler { try { // 推送启动充电结果 Thread.sleep(1000); - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.QUEUE_CHARGE_RESULT_PUSH, orderInfo); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_RESULT_PUSH, orderInfo); } catch (Exception e) { e.printStackTrace(); } @@ -150,7 +150,7 @@ public class RemoteStartChargingRequestHandler extends AbstractYkcHandler { try { Thread.sleep(1000); //充电订单信息推送,订单信息推送,停止充电结果推送,充电账单推送 - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.QUEUE_STARTUP_CHARGING_FAILED_PUSH, orderInfo); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo); } catch (Exception e) { log.error("统一推送第三方平台订单信息error, ", e); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java index 95c865c86..9f1cc8f27 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java @@ -704,7 +704,7 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler { CompletableFuture.runAsync(() -> { try { - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.QUEUE_CHARGE_ORDER_PUSH, finalOrderBasicInfo); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH, finalOrderBasicInfo); } catch (Exception e) { log.error("推送第三方平台订单信息error, ", e); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java index b98d2a9ea..56f0f65fe 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java @@ -386,7 +386,8 @@ public class UploadRealTimeMonitorHandler extends AbstractYkcHandler { // 向mq中发送实时数据消息,给第三方服务消费 CompletableFuture.runAsync(() -> { try { - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.QUEUE_REALTIME_DATA_PUSH, realTimeMonitorData); + 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); } @@ -394,7 +395,7 @@ public class UploadRealTimeMonitorHandler extends AbstractYkcHandler { // 故障 // 异步推送第三方平台告警信息 try { - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.QUEUE_ALARM_PUSH, realTimeMonitorData.getPutGunType()); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType()); } catch (Exception e) { log.error("统一推送第三方平台告警信息 error, ", e); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java index e41e123cd..b1108efed 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/rabbitmq/PileRabbitListener.java @@ -413,7 +413,7 @@ public class PileRabbitListener { // 向mq中发送实时数据消息,给第三方服务消费 CompletableFuture.runAsync(() -> { try { - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.QUEUE_REALTIME_DATA_PUSH, realTimeMonitorData); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData); } catch (Exception e){ log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e); } @@ -421,7 +421,7 @@ public class PileRabbitListener { // 故障 // 异步推送第三方平台告警信息 try { - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.QUEUE_ALARM_PUSH, realTimeMonitorData.getPutGunType()); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType()); } catch (Exception e) { log.error("统一推送第三方平台告警信息 error, ", e); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java index 35cb2f759..124af3381 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/RemoteStartChargingStrategy.java @@ -144,7 +144,7 @@ public class RemoteStartChargingStrategy implements AbstractYkcStrategy { // 启动失败， 推送第三方订单信息 try { Thread.sleep(500); - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME, ThirdPartyRabbitConstants.QUEUE_STARTUP_CHARGING_FAILED_PUSH, orderInfo); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME, ThirdPartyRabbitConstants.ROUTING_KEY_STARTUP_CHARGING_FAILED_PUSH, orderInfo); } catch (Exception e) { log.error("统一推送第三方平台订单信息error, ", e); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java index dede07bbd..bdde705a5 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java @@ -380,7 +380,7 @@ public class UploadRealTimeMonitorStrategy implements AbstractYkcStrategy { // 向mq中发送实时数据消息,给第三方服务消费 CompletableFuture.runAsync(() -> { try { - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.QUEUE_REALTIME_DATA_PUSH, realTimeMonitorData); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_REALTIME_DATA_PUSH, realTimeMonitorData); } catch (Exception e){ log.error("向mq中发送实时数据消息供第三方服务消费 error, ", e); } @@ -388,7 +388,7 @@ public class UploadRealTimeMonitorStrategy implements AbstractYkcStrategy { // 故障 // 异步推送第三方平台告警信息 try { - rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.QUEUE_ALARM_PUSH, realTimeMonitorData.getPutGunType()); + rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME,ThirdPartyRabbitConstants.ROUTING_KEY_ALARM_PUSH, realTimeMonitorData.getPutGunType()); } catch (Exception e) { log.error("统一推送第三方平台告警信息 error, ", e); }