From 8d6ef24217033e13b356502f2ade8737a43cce2b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 19 四月 2025 17:52:15 +0800
Subject: [PATCH] MQ消息队列监管平台数据上传
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java
index d4db2fc..f410000 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java
@@ -132,8 +132,9 @@
@Resource
private RedisTemplate redisTemplate;
-
-
+
+ @Autowired
+ private EnhanceProduce enhanceProduce;
@@ -173,13 +174,6 @@
vo1.setPile_code(pingMessage.getCharging_pile_code());
vo1.setStatus(pingMessage.getCharging_gun_status());
chargingPileClient.updateChargingPileStatus(vo1);
-
- try {
- tcecPushUtil.pushSuperviseNotificationStationStatus(chargingGunClient.getChargingGunByFullNumber(pingMessage.getCharging_pile_code()+pingMessage.getCharging_gun_code()).getData());
- }catch (Exception e){
- e.printStackTrace();
- System.out.println("设备状态推送监管平台失败："+e.getMessage());
- }
}
});
break;
@@ -196,14 +190,28 @@
public void run() {
// 业务处理
chargingOrderClient.endCharge(endCharge.getTransaction_serial_number());
- try {
- TChargingOrder chargingOrder = chargingOrderClient.getOrderByCode(endCharge.getTransaction_serial_number()).getData();
- tcecPushUtil.pushSuperviseNotificationChargeOrderInfo(chargingOrder);
- tcecPushUtil.pushSuperviseNotificationEquipChargeStatus(chargingOrder);
- }catch (Exception e){
- e.printStackTrace();
- System.out.println("充电结束推送监管平台失败："+e.getMessage());
- }
+ // 订单id
+ String transactionSerialNumber = endCharge.getTransaction_serial_number();
+ ChargingOrderMessage chargingOrderMessage = new ChargingOrderMessage();
+ chargingOrderMessage.setOrderNumber(transactionSerialNumber);
+ // 推送充电订单信息
+ ChargingMessage chargingMessage1 = new ChargingMessage();
+ chargingMessage1.setServiceId(SendTagConstant.ORDER_INFO);
+ chargingMessage1.setOrderMessage(chargingOrderMessage);
+ enhanceProduce.orderInfoMessage(chargingMessage1);
+ // 推送充电订单状态
+ ChargingMessage chargingMessage2 = new ChargingMessage();
+ chargingMessage2.setServiceId(SendTagConstant.ORDER_STATUS);
+ chargingMessage2.setOrderMessage(chargingOrderMessage);
+ enhanceProduce.orderStatusMessage(chargingMessage2);
+// try {
+// TChargingOrder chargingOrder = chargingOrderClient.getOrderByCode(endCharge.getTransaction_serial_number()).getData();
+// tcecPushUtil.pushSuperviseNotificationChargeOrderInfo(chargingOrder);
+// tcecPushUtil.pushSuperviseNotificationEquipChargeStatus(chargingOrder);
+// }catch (Exception e){
+// e.printStackTrace();
+// System.out.println("充电结束推送监管平台失败："+e.getMessage());
+// }
}
});
break;
@@ -276,8 +284,15 @@
BeanUtils.copyProperties(uploadRealTimeMonitoringData, query);
chargingOrderClient.chargeMonitoring(query);
chargingOrder.setEndSoc(uploadRealTimeMonitoringDataMessage.getSoc()+"");
-
- tcecPushUtil.pushSuperviseNotificationEquipChargeStatus(chargingOrder);
+ ChargingOrderMessage chargingOrderMessage3 = new ChargingOrderMessage();
+ chargingOrderMessage3.setSoc(uploadRealTimeMonitoringDataMessage.getSoc()+"");
+ chargingOrderMessage3.setOrderNumber(chargingOrder.getCode());
+ // 推送充电订单信息
+ ChargingMessage chargingMessage4 = new ChargingMessage();
+ chargingMessage4.setServiceId(SendTagConstant.ORDER_STATUS);
+ chargingMessage4.setOrderMessage(chargingOrderMessage3);
+ enhanceProduce.orderInfoMessage(chargingMessage4);
+// tcecPushUtil.pushSuperviseNotificationEquipChargeStatus(chargingOrder);
}
});
} catch (Exception e) {
--
Gitblit v1.7.1