From 5e2fe6ce6e80dea99f6eda304dba6fafbb30ad63 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 09 九月 2022 11:34:13 +0800
Subject: [PATCH] 灯杆解绑fix
---
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