From 1e89a0c2fc96040ba50d0fe4305ace22f3daa6cf Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 11 八月 2023 15:35:21 +0800
Subject: [PATCH] 优化通用光电报警只获取小光电数据
---
src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java | 68 +++++++++------------------------
1 files changed, 19 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java b/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
index 1faeb54..02e1fe5 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
@@ -210,7 +210,8 @@
info.setUsername(camera.getUsername());
info.setPassword(camera.getPassword());
login(info);
- GlobalVariable.cameraMap.put(camera.getIp(), camera);
+ String key = camera.getIp() + ":" + camera.getPort();
+ GlobalVariable.cameraMap.put(key, camera);
}
} catch (Exception ex) {
log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
@@ -233,7 +234,8 @@
info.setUsername(camera.getUsername());
info.setPassword(camera.getPassword());
logout(info);
- GlobalVariable.cameraMap.remove(camera.getIp());
+ String key = camera.getIp() + ":" + camera.getPort();
+ GlobalVariable.cameraMap.remove(key);
}
} catch (Exception ex) {
log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
@@ -256,20 +258,20 @@
info.setUsername(alarmHost.getUsername());
info.setPassword(alarmHost.getPassword());
login(info);
- String ip = alarmHost.getIp();
- GlobalVariable.alarmHostMap.put(ip, alarmHost);
+// String key=alarmHost.getIp()+":"+alarmHost.getPort();
+// GlobalVariable.alarmHostMap.put(key, alarmHost);
}
} catch (Exception ex) {
log.error("鍒濆鍖栨姤璀︿富鏈哄紓甯革細" + ex.getMessage());
}
}
+
/**
* @鎻忚堪 鐧诲嚭鎵�鏈夋姤璀︿富鏈�
* @鍒涘缓浜� 鍒樿嫃涔�
* @鍒涘缓鏃堕棿 2023/2/3 10:10
*/
- public static void logoutAllAlarmHost(List<ArdEquipExternal> ardEquipExternals)
- {
+ public static void logoutAllAlarmHost(List<ArdEquipExternal> ardEquipExternals) {
try {
for (ArdEquipExternal alarmHost : ardEquipExternals) {
Thread.sleep(100);
@@ -280,13 +282,14 @@
info.setUsername(alarmHost.getUsername());
info.setPassword(alarmHost.getPassword());
logout(info);
- String ip = alarmHost.getIp();
- GlobalVariable.alarmHostMap.remove(ip);
+// String key=alarmHost.getIp()+":"+alarmHost.getPort();
+// GlobalVariable.alarmHostMap.remove(key);
}
} catch (Exception ex) {
log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
}
}
+
/**
* @鎻忚堪 鐧诲綍鎵�鏈夐棬绂佷富鏈�
* @鍒涘缓浜� 鍒樿嫃涔�
@@ -303,13 +306,15 @@
info.setUsername(accessControlHost.getUsername());
info.setPassword(accessControlHost.getPassword());
login(info);
- String ip = accessControlHost.getIp();
- GlobalVariable.accessHostMap.put(ip, accessControlHost);
+//
+// String key=accessControlHost.getIp()+":"+accessControlHost.getPort();
+// GlobalVariable.accessHostMap.put(key, accessControlHost);
}
} catch (Exception ex) {
log.error("鍒濆鍖栨姤璀︿富鏈哄紓甯革細" + ex.getMessage());
}
}
+
/**
* @鎻忚堪 鐧诲嚭鎵�鏈夐棬绂佷富鏈�
* @鍒涘缓浜� 鍒樿嫃涔�
@@ -326,47 +331,14 @@
info.setUsername(accessControlHost.getUsername());
info.setPassword(accessControlHost.getPassword());
logout(info);
- String ip = accessControlHost.getIp();
- GlobalVariable.accessHostMap.remove(ip);
+// String key=accessControlHost.getIp()+":"+accessControlHost.getPort();
+// GlobalVariable.accessHostMap.remove(key);
}
} catch (Exception ex) {
log.error("鍒濆鍖栨姤璀︿富鏈哄紓甯革細" + ex.getMessage());
}
}
- /**
- * @鎻忚堪 娉ㄩ攢鐧诲綍
- * @鍙傛暟 [dvrLogin]
- * @杩斿洖鍊� java.lang.Integer
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/1/17 16:12
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- public static boolean loginOut(String cameraId) {
- if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
- }
- Integer userId = GlobalVariable.loginMap.get(cameraId);
- boolean b = hCNetSDK.NET_DVR_Logout(userId);
- if (b) {
- GlobalVariable.loginMap.remove(cameraId);
- }
- return b;
- }
- /**
- * 鏄惁鍦ㄧ嚎
- *
- * @param cmd
- */
- public static boolean isOnLine(CameraCmd cmd) {
- String cameraId = cmd.getCameraId();
- if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
- }
- Integer userId = GlobalVariable.loginMap.get(cameraId);
- boolean isOnLine = hCNetSDK.NET_DVR_RemoteControl(userId, HCNetSDK.NET_DVR_CHECK_USER_STATUS, null, 0);
- return isOnLine;
- }
/**
* 寤虹珛甯冮槻涓婁紶閫氶亾锛岀敤浜庝紶杈撴暟鎹�
@@ -402,8 +374,6 @@
lAlarmHandle = hCNetSDK.NET_DVR_SetupAlarmChan_V41(lUserID, m_strAlarmInfo);
if (lAlarmHandle == -1) {
log.error("璁惧銆�" + deviceIpPort + "銆戝竷闃插け璐ワ紝閿欒鐮�==========銆�" + hCNetSDK.NET_DVR_GetLastError());
- // 娉ㄩ攢 閲婃斁sdk璧勬簮
- logout(lUserID);
} else {
log.debug("璁惧銆�" + deviceIpPort + "銆戝竷闃叉垚鍔�");
}
@@ -452,11 +422,11 @@
//璁剧疆鍥剧墖澶у皬
ByteBuffer jpegBuffer = ByteBuffer.allocate(1024 * 1024);
// 鎶撳浘鍒板唴瀛橈紝鍗曞抚鏁版嵁鎹曡幏骞朵繚瀛樻垚JPEG瀛樻斁鍦ㄦ寚瀹氱殑鍐呭瓨绌洪棿涓�
- // log.debug("-----------杩欓噷寮�濮嬪皝瑁� NET_DVR_CaptureJPEGPicture_NEW---------");
+ // log.debug("-----------杩欓噷寮�濮嬪皝瑁� NET_DVR_CaptureJPEGPicture_NEW---------");
boolean is = hCNetSDK.NET_DVR_CaptureJPEGPicture_NEW(userId, channelNum, jpeg, jpegBuffer, 1024 * 1024, a);
//log.debug("-----------杩欓噷寮�濮嬪浘鐗囧瓨鍏ュ唴瀛�----------" + is);
if (is) {
- // log.debug("hksdk(鎶撳浘)-缁撴灉鐘舵�佸��(0琛ㄧず鎴愬姛):" + hCNetSDK.NET_DVR_GetLastError());
+ // log.debug("hksdk(鎶撳浘)-缁撴灉鐘舵�佸��(0琛ㄧず鎴愬姛):" + hCNetSDK.NET_DVR_GetLastError());
byte[] array = jpegBuffer.array();
//瀛樺偍鍒癿inio
--
Gitblit v1.9.3