From 4ac9edd4c0030d2daafd712cd14ef9080b2f1e43 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 10 Feb 2026 11:52:40 +0800
Subject: [PATCH] 优化
---
ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java b/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java
index 4ca608e..5de1b57 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java
@@ -55,15 +55,12 @@
//注销
@Override
- public void logout(String cameraId) {
+ public void logout(ArdCamera ardCamera) {
try {
- ArdCamera ardCamera = redisService.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- cameraSDK.logout(cameraId);
- GlobalVariable.loginMap.remove(cameraId);//移除相机登录id缓存
- }
+
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ cameraSDK.logout(ardCamera);
} catch (Exception ex) {
log.error("注销异常：{}", ex.getMessage());
}
@@ -71,17 +68,11 @@
//在线检测
@Override
- public boolean isOnLine(CameraCmd cmd) {
+ public boolean isOnLine(ArdCamera ardCamera) {
try {
- boolean onLine = false;
- String cameraId = cmd.getCameraId();
- ArdCamera ardCamera = redisService.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- onLine = cameraSDK.isOnLine(cmd);
- }
- return onLine;
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.isOnLine(ardCamera);
} catch (Exception ex) {
log.error("检测在线异常：{}", ex.getMessage());
return false;
@@ -90,16 +81,11 @@
@Override
//获取码流压缩参数
- public VideoCompressionCfg getVideoCompressionCfg(CameraCmd cmd) {
+ public VideoCompressionCfg getVideoCompressionCfg(ArdCamera ardCamera) {
try {
- String cameraId = cmd.getCameraId();
- ArdCamera ardCamera = redisService.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera == null) {
- return null;
- }
String factory = ardCamera.getFactory();
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.getVideoCompressionCfg(cmd);
+ return cameraSDK.getVideoCompressionCfg(ardCamera);
} catch (Exception ex) {
log.error("获取码流压缩参数异常：{}", ex.getMessage());
return null;
--
Gitblit v1.9.3