From 402fe914957546a820c60731181501c554826fa4 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 27 May 2026 09:18:19 +0800
Subject: [PATCH] 1. 提交细节修改。
---
ard-route/src/main/java/com/ard/route/util/InitializationUtils.java | 84 +++++++++++++++++++++++++++++++++++------
1 files changed, 71 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 187f75e..17fc9b1 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
@@ -1,7 +1,15 @@
package com.ard.route.util;
import com.ard.route.domain.djuav.*;
+import com.ard.route.domain.sixhe.ArdRouteActions;
import com.ard.route.domain.sixhe.ArdRouteChange;
+import com.ard.route.domain.sixhe.ArdRoutePoints;
+
+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;
/**
* 初始化数据
@@ -9,7 +17,12 @@
*/
public class InitializationUtils {
- private static final Double CHANSI_H20 = 23.76237623;
+ // 禅思H20T 公倍数
+ private static final Double CHANSI_H20T = 23.76237623;
+
+ // 禅思H20T 焦距值
+ private static final Double CHANSI_H20_FOCUS = 6.83;
+
private static final String WAYPOINT_TURN_MODE_DEFAULT = "toPointAndStopWithDiscontinuityCurvature";
/**
@@ -18,10 +31,11 @@
public UavRouteReq initialization(UavRouteReq uavRouteReq){
uavRouteReq.setTemplateType("waypoint");
// 起始点默认航线第一个点
- if (uavRouteReq.getTakeOffRefPoint().isEmpty()){
+ if (uavRouteReq.getTakeOffRefPoint() == null){
uavRouteReq.setTakeOffRefPoint(
uavRouteReq.getRoutePointList().get(0).getLatitude() + "," +
- uavRouteReq.getRoutePointList().get(0).getLongitude() + "," + "0");
+ uavRouteReq.getRoutePointList().get(0).getLongitude() + "," +
+ uavRouteReq.getRoutePointList().get(0).getHeight());
}
//uavRouteReq.setDroneType(89);
uavRouteReq.setSubDroneType(0);
@@ -39,31 +53,75 @@
if (uavRouteReq.getGlobalWaypointTurnMode() != null){
waypointTurnReq.setWaypointTurnMode(uavRouteReq.getGlobalWaypointTurnMode());
}else {
- waypointTurnReq.setWaypointTurnMode("toPointAndStopWithDiscontinuityCurvature");
+ waypointTurnReq.setWaypointTurnMode(WAYPOINT_TURN_MODE_DEFAULT);
}
uavRouteReq.setWaypointTurnReq(waypointTurnReq);
uavRouteReq.setGimbalPitchMode("usePointSetting");
- //buildZoom(uavRouteReq);
+ if (M350_RTK.getValue().equals(uavRouteReq.getDroneType())) {
+ // 变焦数值加工
+ buildZoom(uavRouteReq);
+ }
+ // 修改每个航点的高度
+ buildHeight(uavRouteReq);
+ // 动作组编号数据加工
+ buildActionGroupReq(uavRouteReq);
return uavRouteReq;
+ }
+
+ /**
+ * 构建动作组编号
+ */
+ public void buildActionGroupReq(UavRouteReq uavRouteReq){
+ int pointActionCounter = 0;
+ for (RoutePointReq routePointReq : uavRouteReq.getRoutePointList()) {
+ if (routePointReq.getActionGroupList() != null){
+ for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
+ actionGroupReq.setActionGroupId(pointActionCounter++);
+ actionGroupReq.setActionGroupStartIndex(routePointReq.getRoutePointIndex());
+ actionGroupReq.setActionGroupEndIndex(routePointReq.getRoutePointIndex());
+ actionGroupReq.setActionTriggerType("reachPoint");
+ }
+
+ }
+ }
+ }
+
+ /**
+ * 修改每个航点的高度
+ * 根据起飞点高度减去当前航点高度
+ */
+ public void buildHeight(UavRouteReq uavRouteReq){
+ if (!"EGM96".equals(uavRouteReq.getHeightMode())){
+ double takeOffHeight = getDoublePoint(uavRouteReq.getTakeOffRefPoint(),"alt");
+ for (RoutePointReq routePointReq : uavRouteReq.getRoutePointList()) {
+ routePointReq.setHeight(routePointReq.getHeight() - takeOffHeight);
+ }
+ }
}
/**
* 变焦动作加工
*/
- private UavRouteReq buildZoom(UavRouteReq uavRouteReq){
+ private void buildZoom(UavRouteReq uavRouteReq){
for (RoutePointReq routePointReq : uavRouteReq.getRoutePointList()) {
- for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
- for (PointActionReq action : actionGroupReq.getActions()) {
- if (action.getZoom() != null){
- action.setZoom(action.getZoom() * CHANSI_H20);
+ if (!routePointReq.getActionGroupList().isEmpty()){
+ for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
+ for (PointActionReq action : actionGroupReq.getActions()) {
+ if (action.getZoom() != null){
+ action.setZoom(multiple23(action.getZoom()));
+ }
}
}
}
}
- return uavRouteReq;
}
- private void initializationSixHe(){
- ArdRouteChange ardRouteChange = new ArdRouteChange();
+ public static Double multiple23(Double zoom){
+ return zoom * CHANSI_H20T;
}
+
+ public static Double divided23(Double zoom){
+ return zoom / CHANSI_H20T;
+ }
+
}
--
Gitblit v1.9.3