优化

liusuyi

2026-02-10 4ac9edd4c0030d2daafd712cd14ef9080b2f1e43

 ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java

@@ -13,6 +13,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
@@ -27,7 +28,7 @@
 **/
@Service
@Slf4j
public class CameraSDKService {
public class CameraSDKService implements CameraSDK {

    @Resource
    private RedisCache redisService;
@@ -37,69 +38,54 @@

    //异步登录
    @Async
    public AjaxResult login(ArdCamera ardCamera) {
    @Override
    public void login(ArdCamera ardCamera) {
        try {
            if (ardCamera == null) {
                return AjaxResult.warn("设备不存在");
                log.warn("设备不存在");
                return;
            }
            String factory = ardCamera.getFactory();
            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
            return cameraSDK.login(ardCamera);//异步登录
            cameraSDK.login(ardCamera);//异步登录
        } catch (Exception ex) {
            log.error("登录异常：{}", ex.getMessage());
            return AjaxResult.error("登录异常：" + ex.getMessage());
        }
    }

    //注销
    public boolean logout(String cameraId) {
        boolean result = false;
    @Override
    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);
                result = cameraSDK.logout(cameraId);
                if (result) {
                    GlobalVariable.loginMap.remove(cameraId);//移除相机登录id缓存
                }
            }

            String factory = ardCamera.getFactory();
            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
            cameraSDK.logout(ardCamera);
        } catch (Exception ex) {
            log.error("注销异常：{}", ex.getMessage());
            return false;
        }
        return result;
    }

    //在线检测
    public boolean isOnLine(CameraCmd cmd) {
    @Override
    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;
        }
    }

    @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;
@@ -107,6 +93,7 @@
    }

    //获取通道列表
    @Override
    public List<ArdChannel> getChannels(ArdCamera camera) {
        try {
            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(camera.getFactory());