From 0e25c569495c69a663ab2e3dc45d8f27332073ff Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 27 六月 2022 11:28:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
index ed85f89..75a9dbc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
@@ -118,35 +118,12 @@
LightDataProcessor.getInstance().process(productKey, deviceName, frame);
} else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_C3_DATA.getCode())) {
// C3鍏呯數妗╀笂鎶ュ鐞�
- c3ChargingReportAnalysis(productKey, deviceName, frame);
+ c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
} else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_ATMOSPHERE_DATA.getCode())) {
-// //娴嬭瘯鐢ㄧ殑
-// String s = "{\"connectType\":\"FE\",\"crc32\":\"8685DF1B\",\"functionCode\":\"A5\",\"orderType\":\"84\",\"payload\":\"F0010022FFFF0101010907640000000000000000419D000000360089000000000002019300008CA14C69\",\"payloadLength\":\"002A\",\"validate\":true}";
-// CommonFrame commonFrame1 = JSON.parseObject(s, CommonFrame.class);
// 澶ф皵鏁版嵁鎸囦护涓婃姤
AirDataProcessor.getInstance().process(productKey, deviceName, frame);
-// atmosphereAnalysis(productKey, deviceName, frame);
} else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_POLE_MONITOR_DATA.getCode())) {
PoleMonitorDataProcessor.getInstance().process(productKey, deviceName, frame);
}
}
-
- private void c3ChargingReportAnalysis(String productKey, String deviceName, CommonFrame frame) {
- String functionCode = frame.getPayload().substring(2, 4);
- if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
- // 蹇冭烦鍖呬笂鎶�(42) 鑻ヤ簲鍒嗛挓鏃犲績璺冲寘鏁版嵁锛屽垯鍒ゆ柇绂荤嚎
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- }
- }
-
}
--
Gitblit v1.9.3