From ef497a4547843e1ade23d80f40bc682dca952ed0 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 06 Nov 2025 15:23:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java b/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
index 298086b..04addc0 100644
--- a/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
@@ -83,12 +83,12 @@
/**
* 全局偏航角模式
*/
- private WaypointHeadingReq waypointHeadingReq;
+ private WaypointHeadingReq waypointHeadingReq; // 用不上
/**
* 全局航点转弯模式
*/
- private WaypointTurnReq waypointTurnReq;
+ private WaypointTurnReq waypointTurnReq; // 用不上
/**
* 云台俯仰角控制模式
@@ -110,11 +110,37 @@
/**
* 建图航拍、倾斜摄影、航带飞行模板参数
*/
- private MappingTypeReq mappingTypeReq;
+ private MappingTypeReq mappingTypeReq; // 用不上
/**
* 航线初始动作列表
*/
private List<PointActionReq> startActionList;
+ /**
+ * 全局航线速度
+ */
+ private Double globalTransitionalSpeed;
+
+ /**
+ * 飞向首航点模式
+ * safely：安全模式
+ * pointToPoint：倾斜飞行模式
+ */
+ private String flyToWaylineMode;
+
+ /**
+ * 航点类型
+ * coordinateTurn：协调转弯，不过点，提前转弯
+ * toPointAndStopWithDiscontinuityCurvature：直线飞行，飞行器到点停
+ * toPointAndStopWithContinuityCurvature：曲线飞行，飞行器到点停
+ * toPointAndPassWithContinuityCurvature：曲线飞行，飞行器过点不停
+ */
+ private String globalWaypointTurnMode;
+
+ /**
+ * 飞行器偏航角模式
+ */
+ private String mappingHeadingMode;
+
}
--
Gitblit v1.9.3