修复相机密码脱敏导致的bug

‘liusuyi’

2024-04-02 6a26b1d539576a556d0f8682af7ae4317de78c7a

 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.device.camera.service.impl;



import com.ruoyi.alarm.global.domain.GuidePoint;

import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;

import com.ruoyi.alarmpoints.well.domain.ArdWellGuideCamera;

import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;

@@ -58,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) {

            // 初始化登录相机异常，记录错误日志

@@ -72,23 +72,35 @@
    }





    //登录

    //同步登录

    @Override

    public Boolean login(ArdCameras ardCamera) {

        boolean result = false;

    public AjaxResult login(ArdCameras ardCamera) {

        try {

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                //sdkStrategy.login(ardCamera);//同步登录

                cameraSDK.asyncLogin(ardCamera);//异步登录

                result = true;

            if (ardCamera == null) {

                return AjaxResult.error("登录相机失败，相机不存在");

            }

            String factory = ardCamera.getFactory();

            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

            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());

        }

    }



    //注销

@@ -130,94 +142,92 @@


    //云台控制

    @Override

    public boolean pTZControl(CameraCmd cmd) {

        try {

            boolean result = false;

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.pTZControl(cmd);

            }

            return result;

        } catch (Exception ex) {

            log.error("ptz控制异常：" + ex.getMessage());

            return false;

    public AjaxResult pTZControl(CameraCmd cmd) {

        String cameraId = cmd.getCameraId();

        ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

        if (ardCamera != null) {

            String factory = ardCamera.getFactory();

            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

            return cameraSDK.pTZControl(cmd);

        } else {

            return AjaxResult.error("摄像头不存在");

        }

    }



    //设置聚焦值

    @Override

    public boolean setFocusPos(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult setFocusPos(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.setFocusPos(cmd);

                return cameraSDK.setFocusPos(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("设置聚焦值异常：" + ex.getMessage());



            return AjaxResult.error("设置聚焦值异常：" + ex.getMessage());

        }

        return result;

    }



    //获取聚焦值

    @Override

    public int getFocusPos(CameraCmd cmd) {

        int result = 0;

    public AjaxResult getFocusPos(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.getFocusPos(cmd);

                return cameraSDK.getFocusPos(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("获取聚焦值异常：" + ex.getMessage());

            return AjaxResult.error("获取聚焦值异常:" + ex.getMessage());

        }

        return result;

    }



    //设置预置位

    @Override

    public boolean setPreset(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult setPreset(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.setPreset(cmd);

                return cameraSDK.setPreset(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("设置预置位异常：" + ex.getMessage());

            return AjaxResult.error("设置预置位异常" + ex.getMessage());

        }

        return result;

    }



    //调用预置位

    @Override

    public boolean gotoPreset(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult gotoPreset(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.gotoPreset(cmd);

                return cameraSDK.gotoPreset(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("调用预置位异常：" + ex.getMessage());

            return AjaxResult.error("调用预置位异常" + ex.getMessage());

        }

        return result;

    }



    //获取码流压缩参数

@@ -240,128 +250,138 @@


    //透雾开关

    @Override

    public boolean controlDefogcfg(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult controlDefogcfg(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.controlDefogcfg(cmd);

                return cameraSDK.controlDefogcfg(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("操控透雾异常：" + ex.getMessage());

            return AjaxResult.error("操控透雾异常" + ex.getMessage());

        }

        return result;

    }



    //红外开关

    @Override

    public boolean controlInfrarecfg(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult controlInfrarecfg(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.controlInfrarecfg(cmd);

                return cameraSDK.controlInfrarecfg(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("操控红外异常：" + ex.getMessage());

            return AjaxResult.error("操控红外异常:" + ex.getMessage());

        }

        return result;

    }



    //手动/自动聚焦

    @Override

    public boolean controlFocusMode(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult controlFocusMode(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.controlFocusMode(cmd);

                return cameraSDK.controlFocusMode(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("操控聚焦模式异常：" + ex.getMessage());

            return AjaxResult.error("操控聚焦模式异常:" + ex.getMessage());

        }

        return result;

    }



    //获取聚焦模式

    @Override

    public String getFocusMode(CameraCmd cmd) {

        String result = "";

    public AjaxResult getFocusMode(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.getFocusMode(cmd);

                return cameraSDK.getFocusMode(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("获取聚焦模式异常：" + ex.getMessage());

            return AjaxResult.error("获取聚焦模式异常：" + ex.getMessage());

        }

        return result;

    }



    //云台加热

    @Override

    public boolean controlPTHeateRpwron(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult controlPTHeateRpwron(CameraCmd cmd) {



        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.controlPTHeateRpwron(cmd);

                return cameraSDK.controlPTHeateRpwron(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("操控云台加热异常：" + ex.getMessage());

            return AjaxResult.error("操控云台加热异常:" + ex.getMessage());

        }

        return result;



    }



    //镜头加热

    @Override

    public boolean controlCameraDeicing(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult controlCameraDeicing(CameraCmd cmd) {



        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.controlCameraDeicing(cmd);

                return cameraSDK.controlCameraDeicing(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("操控云台加热异常：" + ex.getMessage());

            return AjaxResult.error("操控云台加热异常：" + ex.getMessage());

        }

        return result;

    }



    //获取云台锁定信息

    @Override

    public int getPTZLockInfo(CameraCmd cmd) {

        int result = 99;

    public AjaxResult getPTZLockInfo(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.getPTZLockInfo(cmd);

                return cameraSDK.getPTZLockInfo(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("获取云台锁定信息异常：" + ex.getMessage());

            log.error("获取云台锁定信息异常:" + ex.getMessage());

            return AjaxResult.error("获取云台锁定信息异常:" + ex.getMessage());

        }

        return result;

    }



    @Override

@@ -392,7 +412,7 @@


    //获取ptz

    @Override

    public Map<String, Object> getPtz(CameraCmd cmd) {

    public AjaxResult getPtz(CameraCmd cmd) {

        Map<String, Object> map = new HashMap<>();

        try {

            String cameraId = cmd.getCameraId();

@@ -402,96 +422,98 @@
                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                String gdtype = ardCamera.getGdtype();

                if (gdtype.equals("1")) {

                    map = cameraSDK.getPtz(cmd);

                    return cameraSDK.getPtzHigh(cmd);

                } else {

                    return cameraSDK.getPtz(cmd);

                }

                else

                {

                    map = cameraSDK.getPtz1(cmd);

                }

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("获取ptz异常：" + ex.getMessage());

            return AjaxResult.error("获取ptz异常：" + ex.getMessage());

        }

        return map;

    }



    //获取ptz范围

    @Override

    public Map<String, Object> getPtzScope(CameraCmd cmd) {

        Map<String, Object> map = new HashMap<>();

    public AjaxResult getPtzScope(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                map = cameraSDK.getPtzScope(cmd);

                return cameraSDK.getPtzScope(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("获取ptz范围异常：" + ex.getMessage());

            return AjaxResult.error("获取ptz范围异常：" + ex.getMessage());

        }

        return map;

    }



    //设置ptz

    @Override

    public boolean setPtz(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult setPtz(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                String gdtype = ardCamera.getGdtype();

                if (gdtype.equals("1")) {

                    //大光电使用高精度ptz设置

                    result = cameraSDK.setPtz(cmd);

                } else {

                    result = cameraSDK.setPtz1(cmd);

                }



            if (ardCamera == null) {

                return AjaxResult.error("摄像头不存在");

            }

            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(ardCamera.getFactory());

            String gdtype = ardCamera.getGdtype();

            if (gdtype.equals("1")) {

                //大光电使用高精度ptz设置

                return cameraSDK.setPtzHigh(cmd);

            } else {

                return cameraSDK.setPtz(cmd);

            }



        } catch (Exception ex) {

            log.error("设置ptz异常：" + ex.getMessage());

            return AjaxResult.error("设置ptz异常:" + ex.getMessage());

        }

        return result;

    }



    //设置零方位角

    @Override

    public boolean setZeroPtz(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult setZeroPtz(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.setZeroPtz(cmd);

                return cameraSDK.setZeroPtz(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("设置零方位角异常：" + ex.getMessage());

            return AjaxResult.error("设置零方位角异常：" + ex.getMessage());

        }

        return result;

    }



    //引导指向目标

    @Override

    public boolean guideTargetPosition(CameraCmd cmd) {

        boolean result = false;

    public AjaxResult guideTargetPosition(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                result = cameraSDK.guideTargetPosition(cmd);

                return cameraSDK.guideTargetPosition(cmd);

            } else {

                return AjaxResult.error("摄像头不存在");

            }

        } catch (Exception ex) {

            log.error("引导指向目标异常：" + ex.getMessage());

            log.error("引导指向目标异常:" + ex.getMessage());

            return AjaxResult.error("引导指向目标异常:" + ex.getMessage());

        }

        return result;

    }



    //引导指向井

@@ -507,7 +529,8 @@
        if (well == null) {

            return AjaxResult.error("井不存在");

        }

        cmd.setTargetPosition(new double[]{well.getLongitude(), well.getLatitude()});

        GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());

        cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});



        //获取井配置的引导相机列表

        List<ArdWellGuideCamera> ardWellGuideCameraList = well.getArdWellGuideCameraList();

@@ -529,8 +552,7 @@
            cmd.setCameraId(cameraId);

            //获取最近相机的对象

            Optional<ArdWellGuideCamera> first = ardWellGuideCameraList.stream().filter(s -> s.getCameraId().equals(cameraId)).findFirst();

            if(first.isPresent())

            {

            if (first.isPresent()) {

                ArdWellGuideCamera ardWellGuideCamera = first.get();

                Map<String, Double> ptzMap = null;

                //通过通道获取预置位

@@ -557,11 +579,7 @@
                if (ptzMap != null) {

                    //使用ptz引导

                    cmd.setPtzMap(ptzMap);

                    boolean res = setPtz(cmd);

                    if (!res) {

                        return AjaxResult.error("ptz引导失败", "cameraId:" + cameraId);

                    }

                    return AjaxResult.success("ptz引导成功", "cameraId:" + cameraId);

                    return setPtz(cmd);

                }

            }



@@ -579,7 +597,7 @@
            return AjaxResult.error("井位置属于相机禁止引导区域");

        }

        //按井坐标开始引导

        if (!guideTargetPosition(cmd)) {

        if (!guideTargetPosition(cmd).get("code").equals(200)) {

            return AjaxResult.error("井坐标引导失败", "cameraId:" + cameraId);

        }

        return AjaxResult.success("井坐标引导成功", "cameraId:" + cameraId);

@@ -679,14 +697,17 @@
     */

    @Override

    @SdkOperate

    public boolean controlLock(CameraCmd cmd) {

    public AjaxResult controlLock(CameraCmd cmd) {

        String cameraId = cmd.getCameraId();//申请锁的相机

        ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);

        if (ardCameras == null) {

            return AjaxResult.error("设备未登录");

        }

        Date now = new Date();

        now.setTime(now.getTime() + cmd.getExpired() * 1000);

        ardCameras.setOperatorExpired(now);//设置当前过期时间

        ardCamerasService.updateArdCameras(ardCameras);

        return true;

        return AjaxResult.success("操控锁定成功");

    }



    /**

@@ -698,10 +719,13 @@
     * @修改人和其它信息

     */

    @Override

    public boolean controlUnLock(CameraCmd cmd) {

    public AjaxResult controlUnLock(CameraCmd cmd) {

        String cameraId = cmd.getCameraId();//申请解锁的相机

        String operator = cmd.getOperator();//申请者

        ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);

        if (ardCameras == null) {

            return AjaxResult.error("设备未登录");

        }

        if (ardCameras.getOperatorId().equals(operator)) {

            //如果解锁相机的当前用户是申请者，则清空该相机的过期时间

            ardCameras.setOperatorExpired(null);

@@ -710,7 +734,8 @@
                log.debug(cameraId + "--解锁成功");

            }

        }

        return true;



        return AjaxResult.success("操控解锁成功");

    }



    //录像

@@ -788,20 +813,20 @@


    //获取相机架设参数

    @Override

    public Map<String, Object> getGisInfo(CameraCmd cmd) {

        Map<String, Object> map = new HashMap<>();

    public AjaxResult getGisInfo(CameraCmd cmd) {

        try {

            String cameraId = cmd.getCameraId();

            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);

            if (ardCamera != null) {

                String factory = ardCamera.getFactory();

                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);

                map = cameraSDK.getGisInfo(cmd);

                return cameraSDK.getGisInfo(cmd);

            } else {

                return AjaxResult.error("相机不存在");

            }

        } catch (Exception ex) {

            log.error("获取相机架设参数异常：" + ex.getMessage());

            return AjaxResult.error("获取相机架设参数异常：" + ex.getMessage());

        }

        return map;

    }



}