From 4a293865ac437a812eea8800cc0b04314efbd210 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 24 十月 2023 10:06:24 +0800
Subject: [PATCH] 异步登录增加延迟时间避免接口频繁 修改大华通道数量获取
---
ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java | 154 +++++++++++++++++++++++----------------------------
1 files changed, 69 insertions(+), 85 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java
index 80a104c..1a41ec9 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java
@@ -18,6 +18,7 @@
import com.ruoyi.device.dhsdk.module.*;
import com.ruoyi.device.dhsdk.service.IDhClientService;
import com.ruoyi.device.hiksdk.common.GlobalVariable;
+import com.ruoyi.device.camera.service.impl.AsyncLogin;
import com.ruoyi.media.domain.Vtdu;
import com.ruoyi.media.service.IVtduService;
import com.ruoyi.utils.gis.GisUtil;
@@ -25,7 +26,6 @@
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -59,31 +59,11 @@
@Value("${minio.endpoint}")
private String minioEndPoint;
+
// 璁惧鏂嚎閫氱煡鍥炶皟
private static DisConnect disConnect = new DisConnect();
// 缃戠粶杩炴帴鎭㈠
private static HaveReConnect haveReConnect = new HaveReConnect();
-
- /**
- * 鐧诲綍鎵�鏈夌浉鏈�
- * 鍒樿嫃涔�
- * 2023/10/17 8:28:13
- */
- @Override
- public void loginAll() {
- try {
- ArdCameras ardCamera = new ArdCameras();
- ardCamera.setFactory("2");//鑾峰彇澶у崕鐩告満
- List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(ardCamera);
- for (ArdCameras camera : ardCameras) {
- Thread.sleep(500);
- //鐧诲綍
- login(camera);
- }
- } catch (Exception ex) {
- log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
- }
- }
/**
@@ -94,7 +74,8 @@
@Override
public Boolean login(ArdCameras camera) {
LoginModule.init(disConnect, haveReConnect);
- LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword());
+ NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
+ LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword(), m_stDeviceInfo);
if (loginId.longValue() > 0) {
//log.debug(camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛");
if (GlobalVariable.loginMap.containsKey(camera.getId())) {
@@ -103,13 +84,14 @@
//鍒犻櫎绠＄悊閫氶亾
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
camera.setState("1");
- camera.setChanNum(LoginModule.m_stDeviceInfo.byChanNum);
+ camera.setChanNum(m_stDeviceInfo.byChanNum);
camera.setStartDChan(1);
camera.setLoginId((int) loginId.longValue());
ardCamerasService.updateArdCameras(camera);
GlobalVariable.loginMap.put(camera.getId(), loginId);
+
//鑾峰彇鏈�鏂伴�氶亾
- for (int i = 1; i < LoginModule.m_stDeviceInfo.byChanNum + 1; i++) {
+ for (int i = 1; i < m_stDeviceInfo.byChanNum + 1; i++) {
ArdChannel channel = new ArdChannel();
AV_CFG_ChannelName av_cfg_channelName = new AV_CFG_ChannelName();
boolean b = ConfigModule.GetNewDevConfig(loginId, i - 1, CFG_CMD_CHANNELTITLE, av_cfg_channelName);
@@ -135,7 +117,6 @@
if (vtdu != null) {
vtduService.deleteVtduByName(name);
}
-
//娣诲姞鍒版祦濯掍綋
CameraCmd cmd = new CameraCmd(camera.getId(), channel.getChanNo());
Map<String, Object> videoCompressionCfg = getVideoCompressionCfg(cmd);
@@ -207,6 +188,7 @@
* 2023/10/17 8:28:13
*/
@Override
+ @SdkOperate
public boolean pTZControl(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
boolean enable = cmd.isEnable();
@@ -358,7 +340,6 @@
* @淇敼浜哄拰鍏跺畠淇℃伅 娉ㄦ剰淇话瑙掑害璐熷�奸渶瑕佸姞涓�360寰楀埌鐨勬鍊艰繘琛岃缃�
*/
@Override
- @SdkOperate
public boolean setZeroPtz(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
@@ -382,7 +363,6 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- @SdkOperate
public String picCutCate(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
@@ -813,62 +793,66 @@
@Override
public Map<String, Object> getVideoCompressionCfg(CameraCmd cmd) {
Map<String, Object> map = new HashMap<>();
- String cameraId = cmd.getCameraId();
- Integer chanNo = cmd.getChanNo();
- if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return null;
- }
- LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
- CFG_ENCODE_INFO cfg_encode_info = new CFG_ENCODE_INFO();
- cfg_encode_info.nChannelID = chanNo - 1;
- boolean b = ConfigModule.GetNewDevConfig(loginId, chanNo - 1, CFG_CMD_ENCODE, cfg_encode_info);
- if (b) {
- int emCompression = cfg_encode_info.stuMainStream[0].stuVideoFormat.emCompression;//瑙嗛鏍煎紡
- String videoEncType = "";
- switch (emCompression) {
- case 0:
- videoEncType = "MPEG4";
- break;
- case 1:
- videoEncType = "MS-MPEG4";
- break;
- case 2:
- videoEncType = "MPEG2";
- break;
- case 3:
- videoEncType = "MPEG1";
- break;
- case 4:
- videoEncType = "H.263";
- break;
- case 5:
- videoEncType = "MJPG";
- break;
- case 6:
- videoEncType = "FCC-MPEG4";
- break;
- case 7:
- videoEncType = "鏍囧噯h264";
- break;
- case 8:
- videoEncType = "鏍囧噯h265";
- break;
- case 9:
- videoEncType = "SVAC";
- break;
- default:
- videoEncType = "鏈煡";
- break;
+ try {
+ String cameraId = cmd.getCameraId();
+ Integer chanNo = cmd.getChanNo();
+ if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+ return null;
}
- int nBitRate = cfg_encode_info.stuMainStream[0].stuVideoFormat.nBitRate;
- int nWidth = cfg_encode_info.stuMainStream[0].stuVideoFormat.nWidth;
- int nHeight = cfg_encode_info.stuMainStream[0].stuVideoFormat.nHeight;
- String resolution = nWidth + "*" + nHeight;
- float nFrameRate = cfg_encode_info.stuMainStream[0].stuVideoFormat.nFrameRate;
- map.put("resolution", resolution);//鍒嗚鲸鐜�
- map.put("videoBitrate", String.valueOf(nBitRate));//姣旂壒鐜�
- map.put("videoEncType", videoEncType);//缂栫爜
- map.put("nFrameRate", String.valueOf(nFrameRate));//甯х巼
+ LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
+ CFG_ENCODE_INFO cfg_encode_info = new CFG_ENCODE_INFO();
+ cfg_encode_info.nChannelID = chanNo - 1;
+ boolean b = ConfigModule.GetNewDevConfig(loginId, chanNo - 1, CFG_CMD_ENCODE, cfg_encode_info);
+ if (b) {
+ int emCompression = cfg_encode_info.stuMainStream[0].stuVideoFormat.emCompression;//瑙嗛鏍煎紡
+ String videoEncType = "";
+ switch (emCompression) {
+ case 0:
+ videoEncType = "MPEG4";
+ break;
+ case 1:
+ videoEncType = "MS-MPEG4";
+ break;
+ case 2:
+ videoEncType = "MPEG2";
+ break;
+ case 3:
+ videoEncType = "MPEG1";
+ break;
+ case 4:
+ videoEncType = "H.263";
+ break;
+ case 5:
+ videoEncType = "MJPG";
+ break;
+ case 6:
+ videoEncType = "FCC-MPEG4";
+ break;
+ case 7:
+ videoEncType = "鏍囧噯h264";
+ break;
+ case 8:
+ videoEncType = "鏍囧噯h265";
+ break;
+ case 9:
+ videoEncType = "SVAC";
+ break;
+ default:
+ videoEncType = "鏈煡";
+ break;
+ }
+ int nBitRate = cfg_encode_info.stuMainStream[0].stuVideoFormat.nBitRate;
+ int nWidth = cfg_encode_info.stuMainStream[0].stuVideoFormat.nWidth;
+ int nHeight = cfg_encode_info.stuMainStream[0].stuVideoFormat.nHeight;
+ String resolution = nWidth + "*" + nHeight;
+ float nFrameRate = cfg_encode_info.stuMainStream[0].stuVideoFormat.nFrameRate;
+ map.put("resolution", resolution);//鍒嗚鲸鐜�
+ map.put("videoBitrate", String.valueOf(nBitRate));//姣旂壒鐜�
+ map.put("videoEncType", videoEncType);//缂栫爜
+ map.put("nFrameRate", String.valueOf(nFrameRate));//甯х巼
+ }
+ } catch (Exception ex) {
+ log.error("鍙栫爜娴佸帇缂╁弬鏁板紓甯�:" + ex.getMessage());
}
return map;
}
@@ -902,7 +886,7 @@
// 璁惧鏂嚎鍥炶皟: 褰撹澶囧嚭鐜版柇绾挎椂锛孲DK浼氳皟鐢ㄨ鍑芥暟
private static class DisConnect implements NetSDKLib.fDisConnect {
public void invoke(LLong m_hLoginHandle, String pchDVRIP, int nDVRPort, Pointer dwUser) {
- log.warn("Device["+pchDVRIP+"] Port["+nDVRPort+"] DisConnect!");
+ log.warn("Device[" + pchDVRIP + "] Port[" + nDVRPort + "] DisConnect!");
}
}
@@ -910,7 +894,7 @@
private static class HaveReConnect implements NetSDKLib.fHaveReConnect {
@Override
public void invoke(LLong lLoginID, String pchDVRIP, int nDVRPort, Pointer dwUser) {
- log.warn("ReConnect Device["+pchDVRIP+"] Port["+nDVRPort+"]");
+ log.warn("ReConnect Device[" + pchDVRIP + "] Port[" + nDVRPort + "]");
}
}
--
Gitblit v1.9.3