From d2bf8caa38cc592cf5516bf64da27ad1ec8ea308 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 17 十二月 2021 17:30:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 2738004..93fd6ad 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
@@ -4,10 +4,11 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.dao.domain.AirData;
-import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -15,6 +16,21 @@
@Service
@AllArgsConstructor
public class AirDataService extends BaseServiceImpl<AirDataMapper, AirData> {
+ private final AirDataMapper airDataMapper;
+
+ /**
+ * 淇濆瓨涓婃姤澶ф皵蹇冭烦鏁版嵁
+ *
+ * @return 鏄惁鎴愬姛
+ */
+ public boolean saveReportData(String deviceName, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
+
+ AirData airData = new AirData();
+ BeanUtils.copyProperties(heartBeatDataPackage, airData);
+ airData.setDeviceMac(deviceName);
+
+ return save(airData);
+ }
/**
* 鏌ヨ鍏ㄩ儴澶ф皵璁惧
@@ -27,16 +43,10 @@
}
/**
- * 妯＄硦鏌ヨ
+ * 鏌ヨ澶ф皵璁惧MAC鍦板潃
*/
- public List<AirData> listAirDataByKeyword(String keyword) {
-
- LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
- if(keyword != null){
- wrapper.like(AirData::getBelongTo,keyword);
- }
- List<AirData> airDataList = list(wrapper);
- return airDataList;
+ public List<String> listAirEquipmentMAC() {
+ return airDataMapper.listAirEquipmentMAC();
}
}
--
Gitblit v1.9.3