From 9aa66699aaa610be66f5bd0c22e90cae114311f9 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 07 七月 2023 17:15:16 +0800
Subject: [PATCH] 优化外联设备报警解析并上传mqtt
---
src/main/java/com/ard/utils/hiksdk/domain/ExternalAlarmEventInfo.java | 3 +++
src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ard/utils/hiksdk/domain/ExternalAlarmEventInfo.java b/src/main/java/com/ard/utils/hiksdk/domain/ExternalAlarmEventInfo.java
index 6f768be..fd50330 100644
--- a/src/main/java/com/ard/utils/hiksdk/domain/ExternalAlarmEventInfo.java
+++ b/src/main/java/com/ard/utils/hiksdk/domain/ExternalAlarmEventInfo.java
@@ -33,14 +33,17 @@
* 鎶ヨ绫诲埆
*/
String alarmType;
+
/**
* 鎶ヨ鏃堕棿
*/
String alarmTime;
+
/**
* 瀛愮郴缁烮D
*/
Integer subSysNo;
+
/**
* 鍏宠仈鎶ヨ涓绘満id
*/
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
index 991e60a..f01a88e 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
@@ -20,6 +20,7 @@
import com.ard.utils.mqtt.MqttConsumer;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import javax.xml.bind.DatatypeConverter;
import java.io.ByteArrayInputStream;
@@ -222,6 +223,7 @@
if (sCIDDescribe.contains("鎭㈠")) {
return true;
}
+
ExternalAlarmEventInfo externalAlarmEventInfo = new ExternalAlarmEventInfo();
externalAlarmEventInfo.setAlarmId(sCIDCode);
externalAlarmEventInfo.setAlarmName(sCIDDescribe);
--
Gitblit v1.9.3