From 89b46667dc80617e806088a6cd7ceb77fe53a9a6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期六, 07 五月 2022 18:06:11 +0800
Subject: [PATCH] 固件升级
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
index 94475e7..e931197 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
@@ -44,8 +44,10 @@
airEquipment.setCreateTime(airData.getCreateTime());
airEquipmentService.addAirEquipment(airEquipment);
- //瀛樼紦瀛�
- RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage, 300L);
+ //瀛樼紦瀛樺績璺冲寘
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage);
+ //瀛樼紦瀛樼姸鎬�
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + deviceName, heartBeatDataPackage, 300L);
return save(airData);
}
@@ -80,15 +82,20 @@
* +
* 鏍规嵁鐏潌id鏌ヨ澶ф皵鏁版嵁
*/
- public AirData listAirDataByLightPoleId(Long poleId) {
+ public A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage getDataByPoleid(Long poleId) {
String code;
if (SecurityUtils.getClientId() != null) {
code = baseMapper.getCodeByPoleId(poleId, SecurityUtils.getUserId());
} else {
code = baseMapper.getCodeByPoleId(poleId, null);
}
- AirData airData = RedisUtils.getBean().get(code, AirData.class);
- return airData;
+ A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage
+ = RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + code, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ if (heartBeatDataPackage == null) {
+ return null;
+ }
+
+ return heartBeatDataPackage;
}
}
--
Gitblit v1.9.3