From b7cf4a3e5e89e6b39347bf12e6eafff258a84494 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期三, 08 十二月 2021 15:47:38 +0800
Subject: [PATCH] 通信协议完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 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 d5741d1..e0a7a3e 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,8 +1,12 @@
package com.sandu.ximon.admin.manager.iot.amqp;
import com.alibaba.fastjson.JSON;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonReportMessage;
+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;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5C3ReportEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5LightReportEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
import lombok.extern.slf4j.Slf4j;
@@ -76,11 +80,68 @@
/**
* 澶勭悊浠诲姟
*
- * @param productKey 浜у搧鐮�
- * @param deviceName 浜у搧鍚嶇О
- * @param connectFrame 涓婃姤甯�
+ * @param productKey 浜у搧鐮�
+ * @param deviceName 浜у搧鍚嶇О
+ * @param frame 涓婃姤甯�
*/
- private void processTask(String productKey, String deviceName, CommonFrame connectFrame) {
+ private void processTask(String productKey, String deviceName, CommonFrame frame) {
+ if (frame == null) {
+ return;
+ }
+ log.info("澶勭悊璁㈤槄");
+ log.info(frame.toString());
+ if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_LIGHT_DATA.getCode())) {
+ // 鍗曠伅鏁版嵁涓婃姤澶勭悊
+ lightDataReportAnalysis(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);
+ }
+ }
+ private void c3ChargingReportAnalysis(String productKey, String deviceName, CommonFrame frame) {
+ String functionCode = frame.getPayload().substring(2, 4);
+ if (A5C3ReportEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ } else if (A5C3ReportEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ } else if (A5C3ReportEnum.HEART_BEAT.getCode().equals(functionCode)) {
+ A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload());
+ } else if (A5C3ReportEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+
+ } else if (A5C3ReportEnum.CHARGE_STOP.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+
+ } else if (A5C3ReportEnum.ERROR_CODE.getCode().equals(functionCode)) {
+ A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
+
+ }
+ }
+
+ private void atmosphereAnalysis(String productKey, String deviceName, CommonFrame frame) {
+ A5AtmosphereHeartbeatReportInnerFrame transformFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
+// log.info("澶ф皵蹇冭烦涓婃姤");
+// log.info(transformFrame.toString());
+ }
+
+ private void lightDataReportAnalysis(String productKey, String deviceName, CommonFrame frame) {
+ String functionCode = frame.getPayload().substring(2, 4);
+ if (A5LightReportEnum.HeartBeat_Data.getCode().equals(functionCode)) {
+// log.info("蹇冭烦鐩稿簲");
+ A5LightHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5LightHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
+// log.info(heartbeatReportInnerFrame.toString());
+ } else if (A5LightReportEnum.Time_Synchronized.getCode().equals(functionCode)) {
+// log.info("璇锋眰鏃堕棿鍚屾");
+ A5LightTimeSyncReportInnerFrame syncRespInnerFrame = new A5LightTimeSyncReportInnerFrame().transformFrame(frame.getPayload());
+// log.info(syncRespInnerFrame.toString());
+ } else if (A5LightReportEnum.Error_Code.getCode().equals(functionCode)) {
+// log.info("鏁呴殰鐮佷笂鎶�");
+ A5LightErrorCodeReportInnerFrame codeRespInnerFrame = new A5LightErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
+// log.info(codeRespInnerFrame.toString());
+ }
}
}
--
Gitblit v1.9.3