From 6881da4400dba323d6e11a810de0571a7453cfd7 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 25 二月 2022 15:03:18 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 4b26106..04d8bb1 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
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.manager.iot.amqp;
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.frame.inner.report.*;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
@@ -93,13 +94,14 @@
log.info(frame.toString());
if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_LIGHT_DATA.getCode())) {
// 鍗曠伅鏁版嵁涓婃姤澶勭悊
- LightDataProcessor.getInstance().process(productKey,deviceName,frame);
+ LightDataProcessor.getInstance().process(productKey, deviceName, frame);
} else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_C3_DATA.getCode())) {
// C3鍏呯數妗╀笂鎶ュ鐞�
c3ChargingReportAnalysis(productKey, deviceName, frame);
} else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_ATMOSPHERE_DATA.getCode())) {
// 澶ф皵鏁版嵁鎸囦护涓婃姤
- atmosphereAnalysis(productKey, deviceName, frame);
+ AirDataProcessor.getInstance().process(productKey, deviceName, frame);
+// atmosphereAnalysis(productKey, deviceName, frame);
}
}
@@ -107,18 +109,28 @@
String functionCode = frame.getPayload().substring(2, 4);
if (A5C3ReportEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶netRequestFrame");
+ log.info(netRequestFrame.toString());
} else if (A5C3ReportEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ 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());
} else if (A5C3ReportEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
-
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶completeRequestFrame");
+ log.info(completeRequestFrame.toString());
} else if (A5C3ReportEnum.CHARGE_STOP.getCode().equals(functionCode)) {
A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
-
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶stopRequestFrame");
+ log.info(stopRequestFrame.toString());
} else if (A5C3ReportEnum.ERROR_CODE.getCode().equals(functionCode)) {
A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶errorCodeRequestFrame");
+ log.info(errorCodeRequestFrame.toString());
}
}
--
Gitblit v1.9.3