From 6859fcae5d1fd7ff28553032aaaaff0fc04a49b2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 10 八月 2023 14:22:48 +0800
Subject: [PATCH] 优化日志
---
src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java | 111 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 26 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 62455b1..428c3fe 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
@@ -2,8 +2,11 @@
import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.camera.domain.CameraCmd;
-import com.ard.utils.ByteUtils;
+import com.ard.alarm.external.domain.ArdEquipExternal;
+import com.ard.config.MinioClientSingleton;
+import com.ard.utils.other.ByteUtils;
import com.ard.utils.hiksdk.common.GlobalVariable;
+import com.ard.utils.hiksdk.domain.DeviceInfo;
import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.ard.utils.hiksdk.util.minio.MinioUtils;
import com.sun.jna.Native;
@@ -15,8 +18,6 @@
import java.io.*;
import java.nio.ByteBuffer;
import java.util.*;
-
-import static com.ard.utils.hiksdk.common.GlobalVariable.cameraMap;
/**
@@ -126,7 +127,7 @@
* @鍒涘缓鏃堕棿 2023/1/17 16:12
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
- public static void login(ArdCameras camera) {
+ public static void login(DeviceInfo deviceInfo) {
// 鍒濆鍖�
if (!hCNetSDK.NET_DVR_Init()) {
log.error("SDK鍒濆鍖栧け璐�");
@@ -138,10 +139,10 @@
} else {
hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog", true);
}
- String m_sDeviceIP = camera.getIp();
- String m_sUsername = camera.getUsername();
- String m_sPassword = camera.getPassword();
- short m_sPort = camera.getPort().shortValue();
+ String m_sDeviceIP = deviceInfo.getIp();
+ String m_sUsername = deviceInfo.getUsername();
+ String m_sPassword = deviceInfo.getPassword();
+ short m_sPort = deviceInfo.getPort().shortValue();
//璁剧疆杩炴帴鏃堕棿涓庨噸杩炴椂闂�
hCNetSDK.NET_DVR_SetConnectTime(2000, 1);
hCNetSDK.NET_DVR_SetReconnect(100000, true);
@@ -162,7 +163,7 @@
//鏄惁寮傛鐧诲綍锛�0- 鍚︼紝1- 鏄� windowsSDK閲屾槸true鍜宖alse
m_strLoginInfo.bUseAsynLogin = true;
//寮傛鐧诲綍鍥炶皟
- m_strLoginInfo.cbLoginResult = new LoginResultCallBack(camera);
+ m_strLoginInfo.cbLoginResult = new LoginResultCallBack(deviceInfo);
m_strLoginInfo.write();
int i = hCNetSDK.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo);
if (i < 0) {
@@ -179,18 +180,76 @@
* @鍒涘缓鏃堕棿 2023/2/3 10:10
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
-
- public static void loginAll(List<ArdCameras> ardCameras) {
+ public static void loginAllCamera(List<ArdCameras> ardCameras) {
try {
- log.debug("鍔犺浇lib瀹屾垚锛�");
for (ArdCameras camera : ardCameras) {
Thread.sleep(100);
- login(camera);
+ DeviceInfo info = new DeviceInfo();
+ info.setDeviceId(camera.getId());
+ info.setIp(camera.getIp());
+ info.setPort(camera.getPort());
+ info.setUsername(camera.getUsername());
+ info.setPassword(camera.getPassword());
+ login(info);
String ip = camera.getIp();
- cameraMap.put(ip, camera);
+ GlobalVariable.cameraMap.put(ip, camera);
}
} catch (Exception ex) {
log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
+ }
+ }
+
+ /**
+ * @鎻忚堪 鐧诲綍鎵�鏈夋姤璀︿富鏈�
+ * @鍙傛暟 []
+ * @杩斿洖鍊� void
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/2/3 10:10
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ public static void loginAllAlarmHost(List<ArdEquipExternal> ardEquipExternals) {
+ try {
+ for (ArdEquipExternal alarmHost : ardEquipExternals) {
+ Thread.sleep(100);
+ DeviceInfo info = new DeviceInfo();
+ info.setDeviceId(alarmHost.getId());
+ info.setIp(alarmHost.getIp());
+ info.setPort(alarmHost.getPort());
+ info.setUsername(alarmHost.getUsername());
+ info.setPassword(alarmHost.getPassword());
+ login(info);
+ String ip = alarmHost.getIp();
+ GlobalVariable.alarmHostMap.put(ip, alarmHost);
+ }
+ } catch (Exception ex) {
+ log.error("鍒濆鍖栨姤璀︿富鏈哄紓甯革細" + ex.getMessage());
+ }
+ }
+
+ /**
+ * @鎻忚堪 鐧诲綍鎵�鏈夐棬绂佷富鏈�
+ * @鍙傛暟 []
+ * @杩斿洖鍊� void
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/2/3 10:10
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ public static void loginAllAccessControlHost(List<ArdEquipExternal> ardEquipExternals) {
+ try {
+ for (ArdEquipExternal accessControlHost : ardEquipExternals) {
+ Thread.sleep(100);
+ DeviceInfo info = new DeviceInfo();
+ info.setDeviceId(accessControlHost.getId());
+ info.setIp(accessControlHost.getIp());
+ info.setPort(accessControlHost.getPort());
+ info.setUsername(accessControlHost.getUsername());
+ info.setPassword(accessControlHost.getPassword());
+ login(info);
+ String ip = accessControlHost.getIp();
+ GlobalVariable.alarmHostMap.put(ip, accessControlHost);
+ }
+ } catch (Exception ex) {
+ log.error("鍒濆鍖栨姤璀︿富鏈哄紓甯革細" + ex.getMessage());
}
}
@@ -202,7 +261,6 @@
* @鍒涘缓鏃堕棿 2023/1/17 16:12
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
-
public static boolean loginOut(String cameraId) {
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
@@ -220,7 +278,6 @@
*
* @param cmd
*/
-
public static boolean isOnLine(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
@@ -237,10 +294,10 @@
* @param lUserID 鍞竴鏍囪瘑绗�
* @param lAlarmHandle 鎶ヨ澶勭悊鍣�
*/
- public static int setupAlarmChan(int lUserID, int lAlarmHandle) {
+ public static int setupAlarmChan(String deviceIpPort, int lUserID, int lAlarmHandle) {
// 鏍规嵁璁惧娉ㄥ唽鐢熸垚鐨刲UserID寤虹珛甯冮槻鐨勪笂浼犻�氶亾锛屽嵆鏁版嵁鐨勪笂浼犻�氶亾
if (lUserID == -1) {
- log.info("璇峰厛娉ㄥ唽");
+ log.error("璇峰厛娉ㄥ唽");
return lUserID;
}
if (lAlarmHandle < 0) {
@@ -248,7 +305,7 @@
if (fMSFCallBack_V31 == null) {
fMSFCallBack_V31 = new FMSGCallBack();
if (!hCNetSDK.NET_DVR_SetDVRMessageCallBack_V50(0, fMSFCallBack_V31, null)) {
- log.info("璁剧疆鍥炶皟鍑芥暟澶辫触!閿欒鐮�==========銆�" + hCNetSDK.NET_DVR_GetLastError());
+ log.error("璁剧疆鍥炶皟鍑芥暟澶辫触!閿欒鐮�==========銆�" + hCNetSDK.NET_DVR_GetLastError());
}
}
// 杩欓噷闇�瑕佸璁惧杩涜鐩稿簲鐨勫弬鏁拌缃紝涓嶈缃垨璁剧疆閿欒閮戒細瀵艰嚧璁惧娉ㄥ唽澶辫触
@@ -264,12 +321,12 @@
// 甯冮槻鎴愬姛锛岃繑鍥炲竷闃叉垚鍔熺殑鏁版嵁浼犺緭閫氶亾鍙�
lAlarmHandle = hCNetSDK.NET_DVR_SetupAlarmChan_V41(lUserID, m_strAlarmInfo);
if (lAlarmHandle == -1) {
- log.error("璁惧甯冮槻澶辫触锛岄敊璇爜==========銆�" + hCNetSDK.NET_DVR_GetLastError());
+ log.error("璁惧銆�" + deviceIpPort + "銆戝竷闃插け璐ワ紝閿欒鐮�==========銆�" + hCNetSDK.NET_DVR_GetLastError());
// 娉ㄩ攢 閲婃斁sdk璧勬簮
logout(lUserID);
return lAlarmHandle;
} else {
- log.info("鐩告満甯冮槻鎴愬姛");
+ log.debug("璁惧銆�" + deviceIpPort + "銆戝竷闃叉垚鍔�");
return lAlarmHandle;
}
}
@@ -329,13 +386,14 @@
InputStream input = new ByteArrayInputStream(array);
String url = "";
try {
- boolean b = MinioUtils.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input, input.available(), ContentType);
+ boolean b = MinioUtils.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input, ContentType);
if (b) {
- url = MinioUtils.getBucketObjectUrl(cmd.getBucketName(), cmd.getObjectName());
- url = url.indexOf('?') != -1 ? url.substring(0, url.indexOf('?')) : url;
+ // url = MinioUtils.getBucketObjectUrl(cmd.getBucketName(), cmd.getObjectName());
+ // url = url.indexOf('?') != -1 ? url.substring(0, url.indexOf('?')) : url;
+ url = MinioClientSingleton.domainUrl + "/" + cmd.getBucketName() + "/" + cmd.getObjectName();
log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
}
- } catch (IOException ex) {
+ } catch (Exception ex) {
log.error("涓婁紶鏂囦欢寮傚父锛�" + ex.getMessage());
}
return url;
@@ -353,7 +411,7 @@
* 2023/7/6 10:48
*/
public static String getDefenseZoneName(CameraCmd cmd) {
- String name="";
+ String name = "";
try {
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getWZoneIndex();//閫氶亾鍙�==闃插尯鍙�
@@ -379,4 +437,5 @@
}
return name;
}
+
}
\ No newline at end of file
--
Gitblit v1.9.3