更新webrtc-streamer版本 为了避免通道数和通道号混淆修改sdk请求参数channelNum为chanNo sdk接口增加聚焦值获取

‘liusuyi’

2023-09-07 07cac52e0b64a78361ce4a353604c94bd1186a6c

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

@@ -86,7 +86,18 @@
    @Override
    @DataScope(deptAlias = "d", userAlias = "u")
    public List<ArdCameras> selectArdCamerasList(ArdCameras ardCameras) {
        return ardCamerasMapper.selectArdCamerasList(ardCameras);
        List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(ardCameras);
        if (ardCamerasList.size() > 0) {
            for (ArdCameras camera : ardCamerasList) {
                ArdChannel ardChannel = new ArdChannel();
                ardChannel.setDeviceId(camera.getId());
                List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
                if (ardChannels != null) {
                    camera.setChannelList(ardChannels);
                }
            }
        }
        return ardCamerasList;
    }

    /**
@@ -216,11 +227,10 @@
        }
        if (ardCameras.size() > 0) {
            for (ArdCameras camera : ardCameras) {
                ArdChannel ardChannel=new ArdChannel();
                ArdChannel ardChannel = new ArdChannel();
                ardChannel.setDeviceId(camera.getId());
                List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
                if(ardChannels!=null)
                {
                if (ardChannels != null) {
                    camera.setChannelList(ardChannels);
                }
                Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
@@ -268,7 +278,13 @@
                    camera.setChanNo(ArdTool.getChannelBydayNightTime(dayNightTime));
                    ardCameras.put(distance, camera);
                }

                //获取通道列表
                ArdChannel ardChannel = new ArdChannel();
                ardChannel.setDeviceId(camera.getId());
                List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
                if (ardChannels != null) {
                    camera.setChannelList(ardChannels);
                }
            }
            return ardCameras;
        } catch (Exception ex) {
@@ -285,7 +301,7 @@
    @Override
    public List<ArdCameras> getNearCameras(SchedulingParam param) {
        try {
            Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
            Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId();
            Double longitude = param.getLongitude();
            Double latitude = param.getLatitude();
            if (longitude == null && latitude == null) {
@@ -299,7 +315,7 @@
            }
            String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
            //获取所有光电(按部门)
            ArdCameras cameras= new ArdCameras();
            ArdCameras cameras = new ArdCameras();
            cameras.setDeptId(deptId);
            List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(cameras);
            //统计所有光电可视范围内与报警点的距离
@@ -312,7 +328,7 @@
                double distance = GisUtil.getDistance(new double[]{longitude, latitude}, camPosition);
                if (distance <= radius) {
                    /*获取通道列表*/
                    ArdChannel ardChannel=new ArdChannel();
                    ArdChannel ardChannel = new ArdChannel();
                    ardChannel.setDeviceId(camera.getId());
                    List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
                    camera.setChannelList(ardChannels);
@@ -329,6 +345,7 @@
        }
        return null;
    }

    /**
     * 获取监控圈内所有在线光电
     * 刘苏义
@@ -337,16 +354,15 @@
    @Override
    public List<ArdCameras> getNearCamerasWithPolygon(SchedulingParam param) {
        try {
            Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
            Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId();
            List<Point> partitionLocation = param.getPartitionLocation();
            if(partitionLocation==null)
            {
            if (partitionLocation == null) {
                log.debug("多边形坐标集合为空");
                return null;
            }
            String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
            //获取所有光电(按部门)
            ArdCameras cameras= new ArdCameras();
            ArdCameras cameras = new ArdCameras();
            cameras.setDeptId(deptId);
            List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(cameras);
            List<ArdCameras> ardCameras = new ArrayList<>();
@@ -355,11 +371,11 @@
                    continue;
                }
                /*判断坐标是否在多边形范围内*/
                Point camPosition=new Point(camera.getLongitude(),camera.getLatitude());
                Point camPosition = new Point(camera.getLongitude(), camera.getLatitude());
                boolean inPolygon = GisUtil.isInPolygon(camPosition, partitionLocation);
                if (inPolygon) {
                    /*获取通道列表*/
                    ArdChannel ardChannel=new ArdChannel();
                    ArdChannel ardChannel = new ArdChannel();
                    ardChannel.setDeviceId(camera.getId());
                    List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
                    camera.setChannelList(ardChannels);