From cfb17d6e329f3cc7afe3018d6cc8784ebafd5965 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 14 九月 2022 16:08:57 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java |    6 ++----
 1 files changed, 2 insertions(+), 4 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 c299c65..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
@@ -75,9 +75,7 @@
      */
     public void addAirEquipment(AirEquipment airEquipment) {
         AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, airEquipment.getMac()));
-//        //瀛樺偍璁惧鐘舵�佸埌缂撳瓨
-//        RedisUtils.getBean().set(AtmoFunctionCode.AIR_EQUIPMENT_STATE.getCode() + airEquipment.getMac()
-//                , 1, 300L);
+
         if (one == null) {
             save(airEquipment);
             /**
@@ -276,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