From 43e2e8143bd715e80598f92e1f78972b95a2a2b2 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 14 十月 2022 16:58:55 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
index 86ebc33..ec8f163 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
@@ -52,27 +52,28 @@
airEquipmentNongGengService.addAirEquipment(airEquipmentNongGeng);
//瀛樼紦瀛�
- RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG.getCode() + deviceName, heartBeatDataPackage, 300L);
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG.getCode() + deviceName, heartBeatDataPackage);
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG_STATE.getCode() + deviceName, heartBeatDataPackage, 300L);
return save(airDataNongGeng);
}
-
- /**
- * 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
- */
- public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> listAirId;
- if (SecurityUtils.getClientId() == null) {
- listAirId = baseMapper.listAirId(keyword, null);
- } else {
- listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
- }
- if (CollUtil.isEmpty(listAirId)) {
- return CollUtil.newArrayList();
- }
- List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
- return airDataBos;
-
- }
+//
+// /**
+// * 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
+// */
+// public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+// List<Long> listAirId;
+// if (SecurityUtils.getClientId() == null) {
+// listAirId = baseMapper.listAirId(keyword, null);
+// } else {
+// listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
+// }
+// if (CollUtil.isEmpty(listAirId)) {
+// return CollUtil.newArrayList();
+// }
+// List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
+// return airDataBos;
+//
+// }
}
--
Gitblit v1.9.3