From 4dd0d4864ecd0be365d8a5350a3ac9463d0c2ae4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 03 八月 2022 16:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 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 18eab04..26a1e9b 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
@@ -2,19 +2,26 @@
import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.domain.CommonPage;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.ResUtils;
+import com.sandu.common.util.SpringContextHolder;
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.admin.utils.StringUtil;
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.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -32,6 +39,10 @@
* @return 鏄惁鎴愬姛
*/
public boolean saveReportData(String deviceName, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
+ if (heartBeatDataPackage == null) {
+ System.out.println("淇濆瓨澶ф皵璁惧蹇冭烦鍖呮暟鎹紓甯革紝蹇冭烦鍖呬负绌猴紒");
+ return false;
+ }
AirData airData = new AirData();
BeanUtils.copyProperties(heartBeatDataPackage, airData);
@@ -41,11 +52,13 @@
AirEquipment airEquipment = new AirEquipment();
airEquipment.setId(airData.getId());
airEquipment.setMac(airData.getDeviceMac());
- airEquipment.setCreateTime(airData.getCreateTime());
+// airEquipment.setCreateTime(airData.getCreateTime());
airEquipmentService.addAirEquipment(airEquipment);
- //瀛樼紦瀛�
- RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage, 300L);
+ //瀛樼紦瀛樺績璺冲寘
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage);
+ //瀛樼紦瀛樼姸鎬�
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + deviceName, heartBeatDataPackage, 300L);
return save(airData);
}
@@ -53,7 +66,7 @@
/**
* 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
*/
- public List<AirDataBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ public CommonPage listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<Long> listAirId;
if (SecurityUtils.getClientId() == null) {
@@ -61,21 +74,31 @@
} else {
listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
}
+ CommonPage commonPage = CommonPage.restPage(listAirId);
if (CollUtil.isEmpty(listAirId)) {
- return CollUtil.newArrayList();
+ return commonPage;
}
List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
- return airDataBos;
+ commonPage.setList(airDataBos);
+ return commonPage;
}
/**
- * 鏌ヨ澶ф皵璁惧MAC鍦板潃
+ * 鏌ヨ澶ф皵璁惧鍘嗗彶鏁版嵁
*/
- public List<String> listAirEquipmentMAC() {
- return airDataMapper.listAirEquipmentMAC();
+ public List<AirDataBo> listAirDataOfDeviceCode(BaseConditionVO baseConditionVO, String deviceMac) {
+ if (StringUtils.isEmpty(deviceMac)) {
+ throw new BusinessException("璁惧鍙蜂笉鑳戒负绌猴紒");
+ }
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<AirDataBo> list = baseMapper.listAirDataHistory(deviceMac);
+
+ return list;
+
}
+
/**
* +
* 鏍规嵁鐏潌id鏌ヨ澶ф皵鏁版嵁
--
Gitblit v1.9.3