Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-12-13 145e705946adf1e47512f2450e8bdd42662751e6

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

@@ -356,16 +356,6 @@
        } catch (IOException | ClassNotFoundException e) {
            throw new RuntimeException(e);
        }

        // 判断禁飞区
        try {
            arrayWithinNoFlyZone(route.getUavRouteReq().getRoutePointList());
        } catch (ControlException e) {
            log.error("禁飞区错误.航线航点在禁飞区！", e);
            // 返回包含禁飞区错误信息的特定结果
            return false;
        }

        // 1.2通过minio获取航线信息
        // 2.将航线信息转换成对应实体类
        WayLineUploadDTO wayLineUploadDTO = buildWayLineUploadDTO(route);