From 8e384e65b3fc9b0c9116cf2ec2c11e3ad3bc361e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 28 十二月 2023 08:51:08 +0800
Subject: [PATCH] 优化雷达报警接收
---
src/main/java/com/ard/utils/sdk/hiksdk/service/HikClientUtil.java | 5 ++++-
src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java | 2 +-
src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java | 2 +-
src/main/java/com/ard/utils/sdk/hiksdk/service/LoginResultCallBack.java | 2 +-
src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java | 3 +--
src/main/java/com/ard/utils/sdk/hiksdk/service/FMSGCallBack.java | 4 +---
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java b/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
index 02bd926..e028415 100644
--- a/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
@@ -9,8 +9,7 @@
import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.camera.mapper.ArdCamerasMapper;
import com.ard.alarm.camera.service.IArdCamerasService;
-import com.ard.utils.sdk.hiksdk.common.GlobalVariable;
-import com.ard.utils.sdk.hiksdk.service.impl.HikClientUtil;
+import com.ard.utils.sdk.hiksdk.service.HikClientUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java b/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
index bbb5690..e687fe4 100644
--- a/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
+++ b/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
@@ -9,7 +9,7 @@
import com.ard.alarm.external.domain.ArdEquipExternal;
import com.ard.alarm.external.mapper.ArdEquipExternalMapper;
import com.ard.alarm.external.service.IArdEquipExternalService;
-import com.ard.utils.sdk.hiksdk.service.impl.HikClientUtil;
+import com.ard.utils.sdk.hiksdk.service.HikClientUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
diff --git a/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java b/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
index d3841c7..3013205 100644
--- a/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
+++ b/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
@@ -113,7 +113,7 @@
// 杩炴帴鎴愬姛淇℃伅浠嶴et鎷旈櫎
falseConnectSet.remove(ardEquipRadar);
// 杩炴帴鎴愬姛淇℃伅鍐欏叆map
- tureConnectMap.put(host+"_"+port, ardEquipRadar);
+ tureConnectMap.put(host+":"+port, ardEquipRadar);
SuccessConnectMap.put(ardEquipRadar.getId(),futureListener.channel());
}
});
diff --git a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java b/src/main/java/com/ard/utils/sdk/hiksdk/service/FMSGCallBack.java
similarity index 99%
rename from src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java
rename to src/main/java/com/ard/utils/sdk/hiksdk/service/FMSGCallBack.java
index b784e5f..a8b93ea 100644
--- a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java
+++ b/src/main/java/com/ard/utils/sdk/hiksdk/service/FMSGCallBack.java
@@ -1,4 +1,4 @@
-package com.ard.utils.sdk.hiksdk.service.impl;
+package com.ard.utils.sdk.hiksdk.service;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
@@ -9,7 +9,6 @@
import com.ard.alarm.external.service.impl.ArdEquipExternalServiceImpl;
import com.ard.utils.sdk.hiksdk.domain.*;
import com.ard.utils.minio.MinioUtil;
-import com.ard.utils.sdk.hiksdk.domain.isapi.FaceCapture;
import com.ard.utils.sdk.hiksdk.domain.isapi.IsapiAlarm;
import com.ard.utils.util.ByteUtils;
import com.ard.utils.sdk.hiksdk.common.GlobalVariable;
@@ -18,7 +17,6 @@
import com.ard.utils.mqtt.MqttProducer;
import com.ard.utils.util.IdUtils;
import com.sun.jna.Pointer;
-import javafx.scene.Camera;
import lombok.extern.slf4j.Slf4j;
import java.io.*;
diff --git a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/HikClientUtil.java b/src/main/java/com/ard/utils/sdk/hiksdk/service/HikClientUtil.java
similarity index 99%
rename from src/main/java/com/ard/utils/sdk/hiksdk/service/impl/HikClientUtil.java
rename to src/main/java/com/ard/utils/sdk/hiksdk/service/HikClientUtil.java
index ad6ca50..b524c05 100644
--- a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/HikClientUtil.java
+++ b/src/main/java/com/ard/utils/sdk/hiksdk/service/HikClientUtil.java
@@ -1,4 +1,4 @@
-package com.ard.utils.sdk.hiksdk.service.impl;
+package com.ard.utils.sdk.hiksdk.service;
import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.camera.domain.CameraCmd;
@@ -423,4 +423,7 @@
log.error("鑾峰彇IP閫氶亾寮傚父锛�" + ex.getMessage());
}
}
+
+
+
}
\ No newline at end of file
diff --git a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/LoginResultCallBack.java b/src/main/java/com/ard/utils/sdk/hiksdk/service/LoginResultCallBack.java
similarity index 96%
rename from src/main/java/com/ard/utils/sdk/hiksdk/service/impl/LoginResultCallBack.java
rename to src/main/java/com/ard/utils/sdk/hiksdk/service/LoginResultCallBack.java
index 697f83d..c021d2d 100644
--- a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/LoginResultCallBack.java
+++ b/src/main/java/com/ard/utils/sdk/hiksdk/service/LoginResultCallBack.java
@@ -1,4 +1,4 @@
-package com.ard.utils.sdk.hiksdk.service.impl;
+package com.ard.utils.sdk.hiksdk.service;
import com.ard.utils.sdk.hiksdk.common.GlobalVariable;
import com.ard.utils.sdk.hiksdk.domain.DeviceInfo;
--
Gitblit v1.9.3