From 2574db703fa175765394dba9d4e0d623a1bcd16a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 29 十一月 2023 17:19:57 +0800
Subject: [PATCH] 修复bug
---
src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 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 24e4662..c992f8e 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
@@ -265,9 +265,6 @@
info.setUsername(accessControlHost.getUsername());
info.setPassword(accessControlHost.getPassword());
login(info);
-//
-// String key=accessControlHost.getIp()+":"+accessControlHost.getPort();
-// GlobalVariable.accessHostMap.put(key, accessControlHost);
}
} catch (Exception ex) {
log.error("鐧诲綍鎵�鏈夐棬绂佷富鏈哄紓甯革細" + ex.getMessage());
@@ -290,13 +287,12 @@
info.setUsername(accessControlHost.getUsername());
info.setPassword(accessControlHost.getPassword());
logout(info);
-// String key=accessControlHost.getIp()+":"+accessControlHost.getPort();
-// GlobalVariable.accessHostMap.remove(key);
}
} catch (Exception ex) {
log.error("鐧诲嚭鎵�鏈夐棬绂佷富鏈哄紓甯革細" + ex.getMessage());
}
}
+
/**
* @鎻忚堪 鐧诲綍鎵�鏈夎秴鑴�
* @鍒涘缓浜� 鍒樿嫃涔�
@@ -313,9 +309,6 @@
info.setUsername(superBrainHost.getUsername());
info.setPassword(superBrainHost.getPassword());
login(info);
-//
-// String key=accessControlHost.getIp()+":"+accessControlHost.getPort();
-// GlobalVariable.accessHostMap.put(key, accessControlHost);
}
} catch (Exception ex) {
log.error("鐧诲綍鎵�鏈夎秴鑴戝紓甯革細" + ex.getMessage());
@@ -345,6 +338,50 @@
log.error("鐧诲嚭鎵�鏈夎秴鑴戝紓甯革細" + ex.getMessage());
}
}
+ /**
+ * @鎻忚堪 鐧诲綍鎵�鏈夊鑱旇澶�
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/2/3 10:10
+ */
+ public static void loginAllArdEquipExternals(List<ArdEquipExternal> ardEquipExternals) {
+ try {
+ for (ArdEquipExternal ardEquipExternal : ardEquipExternals) {
+ Thread.sleep(100);
+ DeviceInfo info = new DeviceInfo();
+ info.setDeviceId(ardEquipExternal.getId());
+ info.setIp(ardEquipExternal.getIp());
+ info.setPort(ardEquipExternal.getPort());
+ info.setUsername(ardEquipExternal.getUsername());
+ info.setPassword(ardEquipExternal.getPassword());
+ login(info);
+ }
+ } catch (Exception ex) {
+ log.error("鐧诲綍鎵�鏈夊鑱旇澶囧紓甯革細" + ex.getMessage());
+ }
+ }
+ /**
+ * @鎻忚堪 鐧诲嚭鎵�鏈夊鑱旇澶�
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/2/3 10:10
+ */
+ public static void logoutAllArdEquipExternals(List<ArdEquipExternal> ardEquipExternals) {
+ try {
+ for (ArdEquipExternal ardEquipExternal : ardEquipExternals) {
+ Thread.sleep(100);
+ DeviceInfo info = new DeviceInfo();
+ info.setDeviceId(ardEquipExternal.getId());
+ info.setIp(ardEquipExternal.getIp());
+ info.setPort(ardEquipExternal.getPort());
+ info.setUsername(ardEquipExternal.getUsername());
+ info.setPassword(ardEquipExternal.getPassword());
+ logout(info);
+ }
+ } catch (Exception ex) {
+ log.error("鐧诲嚭鎵�鏈夎秴鑴戝紓甯革細" + ex.getMessage());
+ }
+ }
+
+
/**
* 寤虹珛甯冮槻涓婁紶閫氶亾锛岀敤浜庝紶杈撴暟鎹�
@@ -375,6 +412,8 @@
m_strAlarmInfo.byAlarmInfoType = 1;
// 甯冮槻绫诲瀷(浠呴拡瀵归棬绂佷富鏈恒�佷汉璇佽澶�)锛�0 - 瀹㈡埛绔竷闃�(浼氭柇缃戠画浼�)锛�1 - 瀹炴椂甯冮槻(鍙笂浼犲疄鏃舵暟鎹�)
m_strAlarmInfo.byDeployType = 1;
+ //浜鸿劯鎶ヨ淇℃伅绫诲瀷锛�1- 浜鸿劯渚︽祴鎶ヨ 0- 浜鸿劯鎶撴媿鎶ヨ
+ m_strAlarmInfo.byFaceAlarmDetection = 0;
m_strAlarmInfo.write();
// 甯冮槻鎴愬姛锛岃繑鍥炲竷闃叉垚鍔熺殑鏁版嵁浼犺緭閫氶亾鍙�
lAlarmHandle = hCNetSDK.NET_DVR_SetupAlarmChan_V41(lUserID, m_strAlarmInfo);
@@ -440,10 +479,10 @@
InputStream input = new ByteArrayInputStream(array);
String url = "";
try {
- boolean b = MinioUtil.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input,input.available(), ContentType);
+ boolean b = MinioUtil.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input, input.available(), ContentType);
if (b) {
url = MinioUtil.getBucketObjectUrl(cmd.getBucketName(), cmd.getObjectName());
- // log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
+ // log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
}
} catch (Exception ex) {
log.error("涓婁紶鏂囦欢寮傚父锛�" + ex.getMessage());
--
Gitblit v1.9.3