From 9330e9b0e4e70151d36084ecb5695b818cfda2db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 16:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 efe3bc9..7d5e55a 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,7 +5,9 @@
import com.github.pagehelper.PageHelper;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+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.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.dao.domain.AirData;
@@ -41,6 +43,9 @@
airEquipment.setCreateTime(airData.getCreateTime());
airEquipmentService.addAirEquipment(airEquipment);
+ //瀛樼紦瀛�
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage, 300L);
+
return save(airData);
}
@@ -48,10 +53,14 @@
* 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
*/
public List<AirDataBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
- PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
- List<Long> listAirId = baseMapper.listAirId(keyword,clientId);
- if(CollUtil.isEmpty(listAirId)){
+ 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<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
--
Gitblit v1.9.3