增加获取附近相机接口字段可能为空判断

‘liusuyi’

2023-06-21 0d41af875165ed3d4bc0560b7053fdf43df51608

增加获取附近相机接口字段可能为空判断

 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java

@@ -260,6 +260,10 @@
                double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition);
                if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
                    distanceMap.put(camera.getId(), distance);
                    if(StringUtils.isNull(camera.getCamAlarmGuideEnable()))
                    {
                        camera.setCamAlarmGuideEnable(0);
                    }
                    guideMap.put(camera.getId(),camera.getCamAlarmGuideEnable());
                }
            }

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

@@ -142,10 +142,11 @@
        Map<String, Object> map = fetchChildDepartments(sysDept);
        return map;
    }

    /**
     * @描述 递归查询
     * @参数 [sysDept]
     * @返回值 java.util.Map<java.lang.String,java.lang.Object>
     * @返回值 java.util.Map<java.lang.String, java.lang.Object>
     * @创建人 刘苏义
     * @创建时间 2023/6/2 14:38
     * @修改人和其它信息
@@ -177,6 +178,7 @@
        return map;

    }

    /**
     * @描述 通过坐标获取附近的相机
     * @参数 [cmd]
@@ -188,24 +190,36 @@
    @Override
    public TreeMap getNearCamerasBycoordinate(CameraCmd cmd) {
        try {
            double[] targetPosition = cmd.getTargetPosition();
            if (targetPosition == null || (targetPosition != null && targetPosition.length == 0)) {
                log.debug("目标位置为空");
                return new TreeMap<>();
            }
            String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
            //获取所有大光电
            List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
            //统计所有大光电可视范围内与报警点的距离
            Map<String, Double> distanceMap = new HashMap<>();
            TreeMap<Double,ArdCameras> ardCameras = new TreeMap<>();
            TreeMap<Double, ArdCameras> ardCameras = new TreeMap<>();
            for (ArdCameras camera : ardCamerasList) {
                if (camera.getLongitude() == null && camera.getLatitude() == null) {
                    continue;
                }
                double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
                double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition);
                if (camera.getCamMaxVisibleDistance() == null) {
                    continue;
                }
                if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
                    distanceMap.put(camera.getId(), distance);
                    camera.setChannel(ArdTool.getChannelBydayNightTime(dayNightTime));
                    ardCameras.put(distance,camera);
                    ardCameras.put(distance, camera);
                }

            }
            return ardCameras;
        } catch (Exception ex) {
            log.error("引导异常:" + ex.getMessage());
            log.error("获取附近相机异常:" + ex.getMessage());
        }
        return null;
    }