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 |    4 ++++
 1 files changed, 4 insertions(+), 0 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 60723f9..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);

--
Gitblit v1.9.3