From e14c003f6ff4e78740359828c39674507f134c45 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 11:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 18eab04..894d928 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);
}
@@ -67,13 +69,6 @@
List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
return airDataBos;
- }
-
- /**
- * 鏌ヨ澶ф皵璁惧MAC鍦板潃
- */
- public List<String> listAirEquipmentMAC() {
- return airDataMapper.listAirEquipmentMAC();
}
/**
--
Gitblit v1.9.3