‘liusuyi’
2024-04-02 6a26b1d539576a556d0f8682af7ae4317de78c7a
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
@@ -59,12 +59,11 @@
     */
    @Override
    public void run(ApplicationArguments args) {
        try {
            // 从ardCamerasService中获取ArdCameras列表
            List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
            for (ArdCameras camera : ardCameras) {
                login(camera);
                asyncLogin(camera);
            }
        } catch (Exception ex) {
            // 初始化登录相机异常,记录错误日志
@@ -73,23 +72,35 @@
    }
    //登录
    //同步登录
    @Override
    public Boolean login(ArdCameras ardCamera) {
        boolean result = false;
    public AjaxResult login(ArdCameras ardCamera) {
        try {
            if (ardCamera != null) {
            if (ardCamera == null) {
                return AjaxResult.error("登录相机失败,相机不存在");
            }
                String factory = ardCamera.getFactory();
                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
                //sdkStrategy.login(ardCamera);//同步登录
                cameraSDK.asyncLogin(ardCamera);//异步登录
                result = true;
            }
            return cameraSDK.login(ardCamera);//同步登录
        } catch (Exception ex) {
            log.error("登录异常:" + ex.getMessage());
            return false;
            return AjaxResult.error("登录异常:" + ex.getMessage());
        }
        return result;
    }
    @Override
    public AjaxResult asyncLogin(ArdCameras ardCamera) {
        try {
            if (ardCamera == null) {
                return AjaxResult.error("登录相机失败,相机不存在");
            }
            String factory = ardCamera.getFactory();
            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
            return cameraSDK.asyncLogin(ardCamera);//异步登录
        } catch (Exception ex) {
            log.error("登录异常:" + ex.getMessage());
            return AjaxResult.error("登录异常:" + ex.getMessage());
        }
    }
    //注销
@@ -689,8 +700,7 @@
    public AjaxResult controlLock(CameraCmd cmd) {
        String cameraId = cmd.getCameraId();//申请锁的相机
        ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
        if(ardCameras==null)
        {
        if (ardCameras == null) {
            return AjaxResult.error("设备未登录");
        }
        Date now = new Date();
@@ -713,8 +723,7 @@
        String cameraId = cmd.getCameraId();//申请解锁的相机
        String operator = cmd.getOperator();//申请者
        ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
        if(ardCameras==null)
        {
        if (ardCameras == null) {
            return AjaxResult.error("设备未登录");
        }
        if (ardCameras.getOperatorId().equals(operator)) {