From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java
index 79add96..e433eac 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.amqp.processor;
+import com.alibaba.fastjson.JSON;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightErrorCodeReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightHeartbeatReportInnerFrame;
@@ -38,19 +39,36 @@
log.info("蹇冭烦鐩稿簲");
A5LightHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5LightHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
- SpringContextHolder.getBean(LightReportDataService.class).saveReportData(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
- SpringContextHolder.getBean(LightService.class).saveLight(deviceName);
+ if ("363832544e5008ff1741ffff".equals(deviceName)) {
+ System.out.println("蹇冭烦鍖�: " + JSON.toJSONString(heartbeatReportInnerFrame));
+ }
+ if (heartbeatReportInnerFrame.isValidate()) {
+ SpringContextHolder.getBean(LightReportDataService.class).saveReportData(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ //蹇冭烦鍖呬笂鎶ヤ笉淇濆瓨纭欢璁惧淇℃伅
+// SpringContextHolder.getBean(LightService.class).saveLight(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ }
} else if (A5LightReportEnum.Time_Synchronized.getCode().equals(functionCode)) {
-// log.info("璇锋眰鏃堕棿鍚屾");
+ log.info("璇锋眰鏃堕棿鍚屾");
A5LightTimeSyncReportInnerFrame syncRespInnerFrame = new A5LightTimeSyncReportInnerFrame().transformFrame(frame.getPayload());
-// log.info(syncRespInnerFrame.toString());
+ log.info(syncRespInnerFrame.toString());
+ if (syncRespInnerFrame.isValidate()) {
+ SpringContextHolder.getBean(LightService.class).timeSynchronizationInitiative(deviceName, syncRespInnerFrame.getDestinationAddress());
+ }
+
} else if (A5LightReportEnum.Error_Code.getCode().equals(functionCode)) {
log.info("鏁呴殰鐮佷笂鎶�");
A5LightErrorCodeReportInnerFrame codeRespInnerFrame = new A5LightErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
- if (codeRespInnerFrame.getErrorCode() != 0) {
+ log.info(codeRespInnerFrame.isValidate() + "鏄惁閫氳繃鏍￠獙");
+ log.info(codeRespInnerFrame.getErrorCode() + "鏁呴殰鐮�");
+ if (codeRespInnerFrame.isValidate()) {
SpringContextHolder.getBean(LightReportErrorService.class).saveReportError(deviceName, codeRespInnerFrame);
}
+ //0000 琛ㄧず娌℃湁鏁呴殰锛屽彂閫佹竻闄ゆ晠闅滄寚浠�
+ if (codeRespInnerFrame.getErrorCode() == 0) {
+ System.out.println("娓呴櫎鏁呴殰鎿嶄綔!");
+ SpringContextHolder.getBean(LightReportErrorService.class).cleanErrorCode(deviceName, codeRespInnerFrame.getDestinationAddress());
+ }
}
}
}
--
Gitblit v1.9.3