From 5cfcf41368e52dd0128e8561e3709ba3bea833a4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 02 三月 2022 18:13:56 +0800
Subject: [PATCH] 大气数据主动获取保存数据库FIX
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 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 4d77102..a6b034d 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,8 @@
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;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonReportMessage;
@@ -88,17 +90,21 @@
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())) {
// 鍗曠伅鏁版嵁涓婃姤澶勭悊
- lightDataReportAnalysis(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())) {
+// //娴嬭瘯鐢ㄧ殑
+// String s = "{\"connectType\":\"FE\",\"crc32\":\"8685DF1B\",\"functionCode\":\"A5\",\"orderType\":\"84\",\"payload\":\"F0010022FFFF0101010907640000000000000000419D000000360089000000000002019300008CA14C69\",\"payloadLength\":\"002A\",\"validate\":true}";
+// CommonFrame commonFrame1 = JSON.parseObject(s, CommonFrame.class);
// 澶ф皵鏁版嵁鎸囦护涓婃姤
- atmosphereAnalysis(productKey, deviceName, frame);
+ AirDataProcessor.getInstance().process(productKey, deviceName, frame);
+// atmosphereAnalysis(productKey, deviceName, frame);
}
}
@@ -106,18 +112,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());
}
}
@@ -126,22 +142,5 @@
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