From cda9d3a12240ad659efc11603862487d946715b2 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 27 四月 2022 18:14:08 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 5a6e7d6..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
@@ -5,9 +5,12 @@
import com.github.pagehelper.PageHelper;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.dao.bo.AirDataBo;
+import com.sandu.common.util.ResUtils;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.mapper.AirDataMapper;
@@ -41,6 +44,11 @@
airEquipment.setCreateTime(airData.getCreateTime());
airEquipmentService.addAirEquipment(airEquipment);
+ //瀛樼紦瀛樺績璺冲寘
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage);
+ //瀛樼紦瀛樼姸鎬�
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + deviceName, heartBeatDataPackage, 300L);
+
return save(airData);
}
@@ -70,4 +78,24 @@
return airDataMapper.listAirEquipmentMAC();
}
+ /**
+ * +
+ * 鏍规嵁鐏潌id鏌ヨ澶ф皵鏁版嵁
+ */
+ public A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage getDataByPoleid(Long poleId) {
+ String code;
+ if (SecurityUtils.getClientId() != null) {
+ code = baseMapper.getCodeByPoleId(poleId, SecurityUtils.getUserId());
+ } else {
+ code = baseMapper.getCodeByPoleId(poleId, null);
+ }
+ 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