From 1609b77ba4715a7f17030d61d20c8e526861ca1a Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Fri, 23 Jan 2026 14:16:04 +0800
Subject: [PATCH] 1. 修改任务航线业务逻辑，优化写法。
---
ard-route/src/main/java/com/ard/route/util/InitializationUtils.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java b/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
index c81d8a1..f4edd7b 100644
--- a/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
@@ -8,6 +8,7 @@
import java.util.ArrayList;
import java.util.List;
+import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
import static com.ard.route.util.ToolUtils.getDoublePoint;
/**
@@ -55,8 +56,10 @@
}
uavRouteReq.setWaypointTurnReq(waypointTurnReq);
uavRouteReq.setGimbalPitchMode("usePointSetting");
- // 变焦数值加工
- buildZoom(uavRouteReq);
+ if (M350_RTK.getValue().equals(uavRouteReq.getDroneType())) {
+ // 变焦数值加工
+ buildZoom(uavRouteReq);
+ }
// 修改每个航点的高度
buildHeight(uavRouteReq);
// 动作组编号数据加工
@@ -103,7 +106,6 @@
for (PointActionReq action : actionGroupReq.getActions()) {
if (action.getZoom() != null){
action.setZoom(multiple_23(action.getZoom()));
- //action.setZoom(multiple_6(action.getZoom()));
}
}
}
@@ -115,16 +117,8 @@
return zoom * CHANSI_H20T;
}
- public static Double multiple_6(Double zoom){
- return zoom * CHANSI_H20_FOCUS;
- }
-
public static Double divided_23(Double zoom){
return zoom / CHANSI_H20T;
- }
-
- public static Double divided_6(Double zoom){
- return zoom / CHANSI_H20_FOCUS;
}
/**
@@ -287,8 +281,6 @@
// ardRoutePoints1.setLon(103.75851462);
// ardRoutePoints1.setSafeGohomeFlag(0);
// ardRoutePoints1.setSpeed(8);
-//
-//
// }
// private ArdRouteActions buildArdRouteActions(){
--
Gitblit v1.9.3