From 59fcc48c8589b9df2af744fd6c77854061a52f54 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 16 十月 2023 10:07:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 62 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
index e803ca0..5a3e96a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -65,7 +65,7 @@
try {
log.debug("寮�濮嬪姞杞絪dk搴撴枃浠惰矾寰�");
if (Platform.isWindows()) {
- String WIN_PATH = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "HCNetSDK.dll";
+ String WIN_PATH = System.getProperty("user.dir") + File.separator + "lib\\hikDll\\HCNetSDK.dll";
log.debug("褰撳墠Windows骞冲彴鐨剆dk搴撹矾寰勶細" + WIN_PATH);
hCNetSDK = (HCNetSDK) Native.loadLibrary(WIN_PATH, HCNetSDK.class);
} else {
@@ -277,7 +277,9 @@
public void loginAll() {
try {
log.debug("鍔犺浇lib瀹屾垚锛�");
- List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
+ ArdCameras ardCamera = new ArdCameras();
+ ardCamera.setFactory("1");
+ List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(ardCamera);
for (ArdCameras camera : ardCameras) {
Thread.sleep(500);
//寮傛鐧诲綍
@@ -297,11 +299,11 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- public boolean loginOut(String cameraId) {
+ public boolean logout(String cameraId) {
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
boolean b = hCNetSDK.NET_DVR_Logout(userId);
if (b) {
GlobalVariable.loginMap.remove(cameraId);
@@ -321,7 +323,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
return hCNetSDK.NET_DVR_RemoteControl(userId, NET_DVR_CHECK_USER_STATUS, null, 0);
} catch (Exception ex) {
log.error("妫�娴嬪湪绾垮紓甯革細" + ex.getMessage());
@@ -350,7 +352,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
int dwStop;
if (enable) {
dwStop = 0;//寮�鍚�
@@ -436,7 +438,7 @@
return false;
}
// 鑾峰彇鍙傛暟
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
HCNetSDK.NET_DVR_STD_CONFIG struStdCfg = new HCNetSDK.NET_DVR_STD_CONFIG();
HCNetSDK.NET_DVR_GIS_INFO struGisInfo = new HCNetSDK.NET_DVR_GIS_INFO();
struGisInfo.struPtzPosEx.dwFocus = dwFocusPos;
@@ -470,7 +472,7 @@
return new HashMap<>();
}
// 鑾峰彇鍙傛暟
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
HCNetSDK.NET_DVR_STD_CONFIG struStdCfg = new HCNetSDK.NET_DVR_STD_CONFIG();
HCNetSDK.NET_DVR_GIS_INFO struGisInfo = new HCNetSDK.NET_DVR_GIS_INFO();
struStdCfg.read();
@@ -507,7 +509,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
boolean bool = hCNetSDK.NET_DVR_PTZPreset_Other(userId, channelNum, SET_PRESET, PresetIndex);
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
@@ -530,7 +532,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
boolean bool = hCNetSDK.NET_DVR_PTZPreset_Other(userId, channelNum, GOTO_PRESET, PresetIndex);
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
@@ -554,7 +556,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return null;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
Map<String, String> map = new HashMap<>();
NET_DVR_COMPRESSIONCFG_V30 compressioncfg = new NET_DVR_COMPRESSIONCFG_V30();
@@ -794,7 +796,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return null;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
Pointer pioint = m_ptzPosCurrent.getPointer();
@@ -846,7 +848,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
m_ptzPosCurrent.wAction = 1;
try {
@@ -878,7 +880,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
m_ptzPosCurrent.wAction = 1;
try {
@@ -965,7 +967,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return -1;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZ_LOCKCFG netDvrPtzLockcfg = new NET_DVR_PTZ_LOCKCFG();
Pointer point = netDvrPtzLockcfg.getPointer();
IntByReference ibrBytesReturned = new IntByReference(0);
@@ -997,7 +999,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_INITIALPOSITIONCTRL initialpositionctrl = new NET_DVR_INITIALPOSITIONCTRL();
initialpositionctrl.dwSize = initialpositionctrl.size();
@@ -1029,7 +1031,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return new HashMap<>();
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZSCOPE m_ptzPosCurrent = new NET_DVR_PTZSCOPE();
Pointer point = m_ptzPosCurrent.getPointer();
IntByReference ibrBytesReturned = new IntByReference(0);
@@ -1078,7 +1080,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_CAMERAPARAMCFG_EX struCameraParam = new NET_DVR_CAMERAPARAMCFG_EX();
Pointer point = struCameraParam.getPointer();
IntByReference ibrBytesReturned = new IntByReference(0);
@@ -1124,7 +1126,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_CAMERAPARAMCFG_EX struDayNigh = new NET_DVR_CAMERAPARAMCFG_EX();
Pointer point = struDayNigh.getPointer();
IntByReference ibrBytesReturned = new IntByReference(0);
@@ -1172,7 +1174,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
Pointer point = struFocusMode.getPointer();
IntByReference ibrBytesReturned = new IntByReference(0);
@@ -1215,7 +1217,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return "";
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
Pointer point = struFocusMode.getPointer();
IntByReference ibrBytesReturned = new IntByReference(0);
@@ -1245,7 +1247,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
int dwStop;
if (enable) {
dwStop = 0;//寮�鍚�
@@ -1278,7 +1280,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_DEVSERVER_CFG struDeicing = new NET_DVR_DEVSERVER_CFG();
Pointer point = struDeicing.getPointer();
IntByReference ibrBytesReturned = new IntByReference(0);
@@ -1315,7 +1317,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return "";
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
NET_DVR_WORKSTATE_V30 devwork = new NET_DVR_WORKSTATE_V30();
if (!hCNetSDK.NET_DVR_GetDVRWorkState_V30(userId, devwork)) {
// 杩斿洖Boolean鍊硷紝鍒ゆ柇鏄惁鑾峰彇璁惧鑳藉姏
@@ -1358,7 +1360,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return "";
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
//鍥剧墖淇℃伅
NET_DVR_JPEGPARA jpeg = new NET_DVR_JPEGPARA();
//璁剧疆鍥剧墖鍒嗚鲸鐜�
@@ -1422,7 +1424,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return "";
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
//寮哄埗I甯х粨鏋勪綋瀵硅薄
HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME(); //鏂板缓缁撴瀯浣撳璞�
netDvrIFrame.read();
@@ -1483,7 +1485,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
//寮哄埗I甯х粨鏋勪綋瀵硅薄
HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME(); //鏂板缓缁撴瀯浣撳璞�
netDvrIFrame.read();
@@ -1538,7 +1540,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return "";
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
//region 寮哄埗I甯�
HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME(); //鏂板缓缁撴瀯浣撳璞�
netDvrIFrame.read();
@@ -1591,7 +1593,7 @@
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return;
}
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
//寮哄埗I甯х粨鏋勪綋瀵硅薄
HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME(); //鏂板缓缁撴瀯浣撳璞�
netDvrIFrame.read();
@@ -1676,7 +1678,7 @@
return new HashMap<>();
}
// 鑾峰彇鍙傛暟
- Integer userId = GlobalVariable.loginMap.get(cameraId);
+ Integer userId = (Integer)GlobalVariable.loginMap.get(cameraId);
HCNetSDK.NET_DVR_STD_CONFIG struStdCfg = new HCNetSDK.NET_DVR_STD_CONFIG();
HCNetSDK.NET_DVR_GIS_INFO struGisInfo = new HCNetSDK.NET_DVR_GIS_INFO();
struStdCfg.read();
--
Gitblit v1.9.3