1.判断行点是否在禁飞区接口优化。 2.增加禁飞区DTO实体类。 3.上传禁飞区实体类增加。 4.原生实体类文件归类整理。

Xiajijian

2025-11-17 104bbc3c956ba741b61df4d11f76acfecea7622d

 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java

@@ -13,8 +13,8 @@
import com.ard.data.noflyzone.utils.NoFlyZoneUtils;
import com.ard.oss.model.MinioUploadResult;
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.domain.CoordinatePointReq;
import com.ard.route.domain.UavRouteReq;
import com.ard.route.domain.djuav.UavRouteReq;
import com.ard.route.domain.dto.ArdNoflyDto;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.domain.vo.KmzResultVo;
import com.ard.route.mapper.ArdRouteInfoMapper;
@@ -74,6 +74,11 @@
     */
    @Override
    public List<ArdRouteInfo> selectArdRouteInfoList(ArdRouteInfo ardRouteInfo) {
        if ("1".equals(ardRouteInfo.getOrderByTime())) {
            ardRouteInfo.setOrderByTime("DESC");
        }else if ("0".equals(ardRouteInfo.getOrderByTime())) {
            ardRouteInfo.setOrderByTime("ASC");
        }
        return ardRouteInfoMapper.selectArdRouteInfoList(ardRouteInfo);
    }

@@ -87,6 +92,7 @@
    public String insertArdRouteInfo(ArdRouteInfo ardRouteInfo) {
        ardRouteInfo.setId(IdUtils.simpleUUID());
        ardRouteInfo.setCreateTime(DateUtils.getNowDate());
        ardRouteInfo.setUpdateTime(DateUtils.getNowDate()); // 修改时间，用于排序
        if (ardRouteInfo.getGroupId() == null){
            ardRouteInfo.setGroupId("0");
        }
@@ -97,8 +103,7 @@
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
        Integer droneType = subStringDroneType(ardRouteInfo.getAircraft());
        ardRouteInfo.getUavRouteReq().setDroneType(droneType);
        ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
        ardRouteInfo.setRouteData(routeData);
        KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
        ardRouteInfo.setPath(kmzResult.getPath());
@@ -116,18 +121,21 @@
    @Override
    public int updateArdRouteInfo(ArdRouteInfo ardRouteInfo) {
        ardRouteInfo.setUpdateTime(DateUtils.getNowDate());
        KmzResultVo kmzResult = new KmzResultVo();
        // 获取源文件名字
        ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(ardRouteInfo.getId());
        if (route.getName().equals(ardRouteInfo.getName())) {
            kmzResult = routeService.updateKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
        }else {
            kmzResult = routeService.updateKmzNew(ardRouteInfo.getUavRouteReq(), route.getName(), ardRouteInfo.getName());
        // 判断生成kmz文件实体类是否为空，为空就修改航信信息，不修改行点信息。
        if (ardRouteInfo.getUavRouteReq() != null) {
            KmzResultVo kmzResult;
            // 获取源文件名字
            ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(ardRouteInfo.getId());
            if (route.getName().equals(ardRouteInfo.getName())) {
                kmzResult = routeService.updateKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
            }else {
                kmzResult = routeService.updateKmzNew(ardRouteInfo.getUavRouteReq(), route.getName(), ardRouteInfo.getName());
            }
            if ("更新航线kmz文件失败".equals(kmzResult.getData())) {
                return 0;
            }
            ardRouteInfo.setPath(kmzResult.getPath());
        }
        if ("更新航线kmz文件失败".equals(kmzResult.getData())) {
            return 0;
        }
        ardRouteInfo.setPath(kmzResult.getPath());
        return ardRouteInfoMapper.updateArdRouteInfo(ardRouteInfo);
    }

@@ -209,28 +217,11 @@

    /**
     * 判断行点是否在禁飞区
     *
     * @param longitude 经度
     * @param latitude 纬度
     * @return 结果
     */
    @Override
    public Boolean selectRouteInfomationNoFly(Double longitude, Double latitude) {
        if (longitude == null || latitude == null) {
            throw new ControlException("方法参数中未找到有效经纬度字段，无法判断禁飞区！");
        }
        List<ArdNoFlyZone> ardNoFlyZones = ardNoFlyZoneService.selectArdNoFlyZoneList(new ArdNoFlyZone());



        if (!ardNoFlyZones.isEmpty()) {
            Vertex vertex = new Vertex(longitude, latitude);
//            boolean inNoFlyZones = NoFlyZoneUtils.isPointInPolygon(vertex, ardNoFlyZones);
//            if (inNoFlyZones) {
//                throw new ControlException("目标点在禁飞区内，无法执行操作！");
//            }
        }
        return true;
    public Boolean selectRouteInfomationNoFly(ArdNoflyDto ardNoflyDto) {
        return verifyNoFlyZone(ardNoflyDto);
    }

    /**
@@ -242,8 +233,32 @@
        ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
    }

    private void verifyNoFlyZone(CoordinatePointReq a,CoordinatePointReq b){
    /**
     * 判断行点是否在禁飞区
     * 原点 current 第一个节点
     * 目标点 target 第二个节点
     */
    private Boolean verifyNoFlyZone(ArdNoflyDto ardNoflyDto){
        // ③ 查询禁飞区
        List<ArdNoFlyZone> zones = ardNoFlyZoneService.selectArdNoFlyZoneList(new ArdNoFlyZone());
        if (zones.isEmpty()) {
            return  true;
        }
        for (ArdNoFlyZone zone : zones) {
            List<Vertex> polygon = zone.getVertices();
            if (polygon == null || polygon.size() < 3) continue;

            // 检查目标点是否在禁飞区
            if (NoFlyZoneUtils.isPointInPolygon(ardNoflyDto.getTarget(), polygon)) {
                throw new ControlException("目标点在禁飞区【" + zone.getName() + "】内，无法执行操作！");
            }

            // 检查路径是否穿越禁飞区
            if (ardNoflyDto.getCurrent() != null && NoFlyZoneUtils.isLineIntersectPolygon(ardNoflyDto.getCurrent(), ardNoflyDto.getTarget(), polygon)) {
                throw new ControlException("路径穿越禁飞区【" + zone.getName() + "】，无法执行操作！");
            }
        }
        return true;
    }

}