From 85b0ee4bae215560010d0e6d0641705923a1aaa3 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 03 十一月 2023 10:42:53 +0800
Subject: [PATCH] 优化工具类

---
 src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

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 62f68de..aea22b1 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
@@ -14,7 +14,7 @@
 import com.ard.utils.hiksdk.domain.ExternalAlarmEventInfo;
 import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
 import com.ard.utils.other.DateUtils;
-import com.ard.utils.mqtt.MqttConsumer;
+import com.ard.utils.mqtt.MqttProducer;
 import com.ard.utils.spring.SpringUtils;
 import com.ard.utils.uuid.IdUtils;
 import com.sun.jna.Pointer;
@@ -48,7 +48,7 @@
     @Override
     public boolean invoke(int lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
         SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String sDeviceIP = ByteUtils.bytesToStringZh(pAlarmer.sDeviceIP);//璁惧IP鍦板潃
+        String sDeviceIP = ByteUtils.bytesToStringZh(pAlarmer.sDeviceIP).trim();//璁惧IP鍦板潃
         Integer wLinkPort = Integer.valueOf(pAlarmer.wLinkPort);//璁惧閫氳绔彛
         CameraEventInfo info;
         String sTime;//浜嬩欢鏃堕棿
@@ -440,7 +440,7 @@
      */
     private void publishMqtt(CameraEventInfo info) {
         printLog(info);
-        MqttConsumer.publish(2, false, "camera", JSON.toJSONString(info));
+        MqttProducer.publish(2, false, "camera", JSON.toJSONString(info));
     }
 
     /**
@@ -448,7 +448,7 @@
      */
     private void publishMqtt(ExternalAlarmEventInfo info) {
         printLog(info);
-        MqttConsumer.publish(2, false, "external", JSON.toJSONString(info));
+        MqttProducer.publish(2, false, "external", JSON.toJSONString(info));
     }
 
     /**
@@ -456,7 +456,7 @@
      */
     private void publishMqtt(AccessControlHostEventInfo info) {
         printLog(info);
-        MqttConsumer.publish(2, false, "accessControl", JSON.toJSONString(info));
+        MqttProducer.publish(2, false, "accessControl", JSON.toJSONString(info));
     }
 
     /**

--
Gitblit v1.9.3