From 19d542ddaa4a2d5a737912505e3195948ffa9ebe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 04 八月 2022 10:48:34 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 bac6106..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
@@ -39,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);
@@ -48,7 +52,7 @@
AirEquipment airEquipment = new AirEquipment();
airEquipment.setId(airData.getId());
airEquipment.setMac(airData.getDeviceMac());
- airEquipment.setCreateTime(airData.getCreateTime());
+// airEquipment.setCreateTime(airData.getCreateTime());
airEquipmentService.addAirEquipment(airEquipment);
//瀛樼紦瀛樺績璺冲寘
@@ -94,6 +98,7 @@
}
+
/**
* +
* 鏍规嵁鐏潌id鏌ヨ澶ф皵鏁版嵁
--
Gitblit v1.9.3