From 1482b5b13c171a54c3db59da37c82848bb89f54e Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 28 Oct 2025 14:30:34 +0800
Subject: [PATCH] 优化
---
ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java | 27 +++++----------------------
1 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java
index 71d324f..54fa4d5 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java
@@ -1,13 +1,10 @@
package com.ard.device.component.sdk.dh.service.impl;
-import com.ard.common.core.domain.AjaxResult;
import com.ard.common.utils.StringUtils;
import com.ard.device.camera.domain.ArdCamera;
import com.ard.device.camera.domain.CameraCmd;
-import com.ard.device.camera.service.IArdCameraService;
import com.ard.device.channel.domain.ArdChannel;
import com.ard.device.channel.domain.VideoCompressionCfg;
-import com.ard.device.channel.service.IArdChannelService;
import com.ard.device.component.sdk.common.GlobalVariable;
import com.ard.device.component.sdk.common.osSelect;
import com.ard.device.component.sdk.dh.module.ConfigModule;
@@ -41,12 +38,7 @@
public class DaHuaSDK implements CameraSDK {
@Resource
- private IArdCameraService ardCameraService;
- @Resource
- private IArdChannelService ardChannelService;
- @Resource
private ApplicationEventPublisher eventPublisher;
-
public static NetSDKLib netsdk = null;
public static NetSDKLib configsdk = null;
@@ -107,7 +99,7 @@
* 登录
*/
@Override
- public AjaxResult login(ArdCamera camera) {
+ public void login(ArdCamera camera) {
try {
NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
NetSDKLib.LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword(), m_stDeviceInfo);
@@ -118,7 +110,6 @@
LoginEvent loginEvent = new LoginEvent(camera);
eventPublisher.publishEvent(loginEvent);
log.warn("设备[{}:{}]登录失败:{}", camera.getIp(), camera.getPort(), getErrorCodePrint());
- return AjaxResult.warn(getErrorCodePrint());
}
log.debug("设备[{}:{}]登录成功:{}", camera.getIp(), camera.getPort(), loginId);
camera.setState("1");
@@ -133,12 +124,8 @@
}
LoginEvent loginEvent = new LoginEvent(camera);
eventPublisher.publishEvent(loginEvent);
- //创建引导队列
- //createGuideQueue(camera);
- return AjaxResult.success("登录成功");
} catch (Exception ex) {
log.error("登录异常:{}", ex.getMessage());
- return AjaxResult.error("登录异常:" + ex.getMessage());
}
}
@@ -146,16 +133,14 @@
* 注销
* 刘苏义
* 2023/10/17 8:28:13
- *
- * @return
*/
@Override
- public boolean logout(String cameraId) {
+ public void logout(String cameraId) {
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return;
}
NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
- return LoginModule.logout(loginId);
+ LoginModule.logout(loginId);
}
/**
@@ -186,7 +171,7 @@
/**
* 获取通道
*/
-
+ @Override
public List<ArdChannel> getChannels(ArdCamera camera) {
if (camera.getLoginId() < 0) {
return new ArrayList<>();
@@ -215,7 +200,6 @@
}
return ardChannelList;
}
-
@Override
public VideoCompressionCfg getVideoCompressionCfg(CameraCmd cmd) {
@@ -282,7 +266,6 @@
return null;
}
}
-
/**
* 动态库加载 - 大华 NetSDK + ConfigSDK
--
Gitblit v1.9.3