From d647b819f2a73b98df27469e09846dcc34bc383d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 14 三月 2022 12:00:00 +0800
Subject: [PATCH] C3充电桩

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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 a6b034d..1f2f9c3 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
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSON;
 import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
 import com.sandu.ximon.admin.manager.iot.amqp.processor.LightDataProcessor;
+import com.sandu.ximon.admin.manager.iot.amqp.processor.c3ChargingProcessor;
 import com.sandu.ximon.admin.manager.iot.frame.inner.report.*;
 import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
 import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonReportMessage;
@@ -58,8 +59,8 @@
             String topic = message.getStringProperty("topic");
             String messageId = message.getStringProperty("messageId");
 
-//            log.info("鏀跺埌璁㈤槄" + topic + "," + messageId);
-//            log.info(content);
+            log.info("鏀跺埌璁㈤槄" + topic + "," + messageId);
+            log.info(content);
 
             if (null != map.get("status")) {
                 // 涓婁笅绾夸笂鎶ュ鐞�
@@ -90,8 +91,8 @@
         if (frame == null) {
             return;
         }
-//        log.info("澶勭悊璁㈤槄");
-//        log.info(frame.toString());
+        log.info("澶勭悊璁㈤槄");
+        log.info(frame.toString());
         if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_LIGHT_DATA.getCode())) {
             // 鍗曠伅鏁版嵁涓婃姤澶勭悊
             LightDataProcessor.getInstance().process(productKey, deviceName, frame);
@@ -119,9 +120,7 @@
             log.info("C3鍏呯數妗╀笂鎶ュ鐞哶codeRequestFrame");
             log.info(codeRequestFrame.toString());
         } else if (A5C3ReportEnum.HEART_BEAT.getCode().equals(functionCode)) {
-            A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload());
-            log.info("C3鍏呯數妗╀笂鎶ュ鐞哶heartbeatReportInnerFrame");
-            log.info(heartbeatReportInnerFrame.toString());
+            c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
         } else if (A5C3ReportEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
             A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
             log.info("C3鍏呯數妗╀笂鎶ュ鐞哶completeRequestFrame");

--
Gitblit v1.9.3