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 | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 407ba53..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
@@ -1,10 +1,16 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollUtil;
+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.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereNewHeartbeatReportInnerFrame;
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.bo.AirDataNongGengBo;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirDataNongGeng;
import com.sandu.ximon.dao.domain.AirEquipment;
@@ -13,6 +19,8 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 澶ф皵鏁版嵁锛屽啘鑰曠‖浠�
@@ -43,9 +51,29 @@
airEquipmentNongGeng.setCreateTime(airDataNongGeng.getCreateTime());
airEquipmentNongGengService.addAirEquipment(airEquipmentNongGeng);
-// //瀛樼紦瀛�
-// RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.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;
+//
+// }
}
--
Gitblit v1.9.3