From af4cd17b9851e940dd1dc8a43b3b21fbdd452f76 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 23 九月 2022 17:09:54 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index e93a5dd..a9b9dec 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -220,7 +220,6 @@
      * @return
      */
     public A5AtmosphereQuerySensorInfoReportInnerFrame.SensorInfoPackage QuerySensorInfo(String mac) {
-        //TODO
         if (StringUtil.strIsNullOrEmpty(mac)) {
             throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
         }
@@ -275,7 +274,7 @@
 //        FEA584000CFE040004FFFF0105954FAA7F1123C0CB         -----------commonFrame
         A5AtmosphereQueryVersionReportInnerFrame a5AtmosphereQueryVersionReportInnerFrame =
                 new A5AtmosphereQueryVersionReportInnerFrame().transformFrame(commonFrame.getPayload());
-        if (a5AtmosphereQueryVersionReportInnerFrame.isValidate()) {
+        if (a5AtmosphereQueryVersionReportInnerFrame != null && a5AtmosphereQueryVersionReportInnerFrame.isValidate()) {
             return a5AtmosphereQueryVersionReportInnerFrame.getVersion();
         } else {
             throw new BusinessException("鏁版嵁鏍¢獙寮傚父锛�");

--
Gitblit v1.9.3