From 5f45690421f5fa95355edf676cf2148327555bfc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 27 七月 2022 18:20:37 +0800
Subject: [PATCH] 充电桩故障存储
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/AirDataProcessor.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/AirDataProcessor.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/AirDataProcessor.java
index a8dce59..f7a88ea 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/AirDataProcessor.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/AirDataProcessor.java
@@ -2,8 +2,10 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereNewHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5AtmosphereReportEnum;
+import com.sandu.ximon.admin.service.AirDataNongGengService;
import com.sandu.ximon.admin.service.AirDataService;
import lombok.extern.slf4j.Slf4j;
@@ -19,7 +21,7 @@
}
public static AirDataProcessor getInstance() {
- return AirDataProcessor.AirDataProcessorHolder.INSTANCE;
+ return AirDataProcessorHolder.INSTANCE;
}
private static class AirDataProcessorHolder {
@@ -31,7 +33,7 @@
public void process(String productKey, String deviceName, CommonFrame frame) {
String functionCode = frame.getPayload().substring(2, 4);
if (A5AtmosphereReportEnum.HeartBeat_Data.getCode().equals(functionCode)) {
- log.info("蹇冭烦鐩稿簲");
+ log.info("蹇冭烦鐩稿簲鈥斺�斿ぇ姘旀暟鎹�");
A5AtmosphereHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
log.info(heartbeatReportInnerFrame.toString());
@@ -39,6 +41,17 @@
// SpringContextHolder.getBean(LightService.class).saveLight(deviceName,heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ } else if (A5AtmosphereReportEnum.HeartBeat_Data_Nong_Geng.getCode().equals(functionCode)) {
+ log.info("蹇冭烦鐩稿簲鈥斺�斿ぇ姘旀暟鎹�(鍐滆��)");
+ A5AtmosphereNewHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5AtmosphereNewHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
+ if (heartbeatReportInnerFrame != null && heartbeatReportInnerFrame.isValidate()) {
+ log.info(heartbeatReportInnerFrame.toString());
+ SpringContextHolder.getBean(AirDataNongGengService.class).saveReportData(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ }else{
+ System.out.println("鏁版嵁鏍￠獙寮傚父锛�");
+ }
+
+
}
}
}
--
Gitblit v1.9.3