From 881b19b376d4df2e82badff6691f27c5827c7c57 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 04 一月 2022 09:55:26 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 93fd6ad..f6056f4 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
@@ -1,11 +1,11 @@
package com.sandu.ximon.admin.service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.sandu.common.execption.BusinessException;
+
import com.sandu.common.service.impl.BaseServiceImpl;
+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;
+import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -17,6 +17,7 @@
@AllArgsConstructor
public class AirDataService extends BaseServiceImpl<AirDataMapper, AirData> {
private final AirDataMapper airDataMapper;
+ private final AirEquipmentService airEquipmentService;
/**
* 淇濆瓨涓婃姤澶ф皵蹇冭烦鏁版嵁
@@ -29,17 +30,32 @@
BeanUtils.copyProperties(heartBeatDataPackage, airData);
airData.setDeviceMac(deviceName);
+ //灏嗚澶囦俊鎭坊鍔犲埌澶ф皵璁惧琛�
+ AirEquipment airEquipment = new AirEquipment();
+ airEquipment.setId(airData.getId());
+ airEquipment.setMac(airData.getDeviceMac());
+ airEquipment.setCreateTime(airData.getCreateTime());
+ airEquipmentService.addAirEquipment(airEquipment);
+
return save(airData);
}
/**
- * 鏌ヨ鍏ㄩ儴澶ф皵璁惧
+ * 鏌ヨ鍏ㄩ儴澶ф皵鏁版嵁
*/
- public List<AirData> listAirData() {
- LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
- List<AirData> list = list(wrapper);
+ public List<AirDataBo> listAirData() {
+ return airDataMapper.listAirData();
+ }
- return list;
+ /**
+ * 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
+ */
+ public List<AirDataBo> listAirDataByKeyword(String keyword) {
+ if (keyword == null || keyword.trim().length() == 0) {
+ return listAirData();
+ } else {
+ return airDataMapper.listAirDataByKeyword(keyword);
+ }
}
/**
--
Gitblit v1.9.3