From d8f6f86c958a2fda8b0454d1fed82e3da5f47eb1 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 25 四月 2022 16:06:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 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
new file mode 100644
index 0000000..86ebc33
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
@@ -0,0 +1,78 @@
+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;
+import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
+import com.sandu.ximon.dao.mapper.AirDataNongGengMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 澶ф皵鏁版嵁锛屽啘鑰曠‖浠�
+ *
+ * @author ZZQ
+ * @date 2022/4/25 14:16
+ */
+@Service
+@AllArgsConstructor
+public class AirDataNongGengService extends BaseServiceImpl<AirDataNongGengMapper, AirDataNongGeng> {
+ private final AirEquipmentNongGengService airEquipmentNongGengService;
+
+ /**
+ * 淇濆瓨涓婃姤澶ф皵蹇冭烦鏁版嵁
+ *
+ * @return 鏄惁鎴愬姛
+ */
+ public boolean saveReportData(String deviceName, A5AtmosphereNewHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
+
+ AirDataNongGeng airDataNongGeng = new AirDataNongGeng();
+ BeanUtils.copyProperties(heartBeatDataPackage, airDataNongGeng);
+ airDataNongGeng.setMac(deviceName);
+
+ //灏嗚澶囦俊鎭坊鍔犲埌澶ф皵璁惧琛�
+ AirEquipmentNongGeng airEquipmentNongGeng = new AirEquipmentNongGeng();
+ airEquipmentNongGeng.setId(airDataNongGeng.getId());
+ airEquipmentNongGeng.setMac(airDataNongGeng.getMac());
+ airEquipmentNongGeng.setCreateTime(airDataNongGeng.getCreateTime());
+ airEquipmentNongGengService.addAirEquipment(airEquipmentNongGeng);
+
+ //瀛樼紦瀛�
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG.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