取消坐标数组改为实体类

‘liusuyi’

2024-03-11 7dfd5f52332212d2f2c111cc11147469a68b7bdb

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

@@ -3,6 +3,7 @@
import java.util.*;
import java.util.stream.Collectors;

import com.ruoyi.alarm.global.domain.GuidePoint;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.CameraConstants;
@@ -17,10 +18,12 @@
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.domain.DeptAndCamerasDto;
import com.ruoyi.device.channel.domain.ArdChannel;
import com.ruoyi.device.channel.mapper.ArdChannelMapper;
import com.ruoyi.media.service.IVtduService;
import com.ruoyi.scheduling.domian.SchedulingParam;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.device.camera.domain.ArdCameras;
@@ -52,7 +55,8 @@
    private SysDeptMapper sysDeptMapper;
    @Resource
    private RedisCache redisCache;

    @Autowired
    private ISysDeptService deptService;
    @Resource
    private ArdChannelMapper ardChannelMapper;
    @Resource
@@ -306,7 +310,6 @@
     * @创建时间 2023/6/2 10:58
     * @修改人和其它信息
     */

    @Override
    public Map getChildDeptAndCamera(Boolean disabled) {
        Long deptId = SecurityUtils.getDeptId();
@@ -315,6 +318,11 @@
        return map;
    }

    @Override
    public List<DeptAndCamerasDto> getChildDeptAndCamera() {
        List<SysDept> depts = deptService.selectDeptList(new SysDept());
        return fetchChildDepartments(depts);
    }
    /**
     * @描述 递归查询
     * @参数 [sysDept]
@@ -354,7 +362,34 @@
        }
        map.put("children", childList);
        return map;
    }

    /**
     * 获取所有部门及部门下的相机
     * 刘苏义
     * 2024/3/4 14:45:03
     */
    public List<DeptAndCamerasDto> fetchChildDepartments(List<SysDept> sysDepts) {

        List<DeptAndCamerasDto> deptAndCamerasList = sysDepts.stream()
                .map(sysDept -> {
                    List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasByDeptId(sysDept.getDeptId());
                    ardCameras.stream().forEach(ardCamera ->{
                        ArdChannel  ardChannel = new ArdChannel();
                        ardChannel.setDeviceId(ardCamera.getId());
                        List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
                        if (ardChannels != null) {
                            ardCamera.setChannelList(ardChannels);
                        }
                    });
                    DeptAndCamerasDto deptAndCamerasDto = new DeptAndCamerasDto();
                    deptAndCamerasDto.setSysDept(sysDept);
                    deptAndCamerasDto.setArdCamerasList(ardCameras);
                    return deptAndCamerasDto;
                })
                .collect(Collectors.toList());

        return deptAndCamerasList;
    }

    /**
@@ -369,7 +404,7 @@
    public TreeMap getNearCamerasBycoordinate(CameraCmd cmd) {
        try {
            double[] targetPosition = cmd.getTargetPosition();
            if (targetPosition == null || (targetPosition != null && targetPosition.length == 0)) {
            if (targetPosition == null) {
                log.debug("目标位置为空");
                return new TreeMap<>();
            }
@@ -384,7 +419,7 @@
                    continue;
                }
                double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
                double distance = GisUtil.getDistance(cmd.getTargetPosition(), camPosition);
                double distance = GisUtil.getDistance(targetPosition, camPosition);
                if (camera.getCamMaxVisibleDistance() == null) {
                    continue;
                }