From 3f43e40ed1a1e9f66b3ad2862da9dbc4b710c712 Mon Sep 17 00:00:00 2001
From: nishiwei <13126973358@163.com>
Date: Fri, 23 Oct 2026 14:09:47 +0800
Subject: [PATCH] 智云3.0机场1适配内容提交
---
ard-route/src/main/java/com/ard/route/util/InitializationUtils.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 17fc9b1..56734ea 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
@@ -4,9 +4,12 @@
import com.ard.route.domain.sixhe.ArdRouteActions;
import com.ard.route.domain.sixhe.ArdRouteChange;
import com.ard.route.domain.sixhe.ArdRoutePoints;
+import com.ard.route.enums.kml.DroneEnumValueEnums;
+import com.ard.route.enums.kml.PayloadTypeEnums;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
import static com.ard.route.util.ToolUtils.getDoublePoint;
@@ -38,8 +41,18 @@
uavRouteReq.getRoutePointList().get(0).getHeight());
}
//uavRouteReq.setDroneType(89);
- uavRouteReq.setSubDroneType(0);
- uavRouteReq.setPayloadType(43);
+ // 机场1：M30/M30T 使用机身自带双光/三光相机，payloadEnumValue 分别为 52/53，
+ // 不能沿用 H20T(43)。其余机型保持原有逻辑，机场2/3 的航线生成结果不变。
+ if (Objects.equals(DroneEnumValueEnums.M30_M30T.getValue(), uavRouteReq.getDroneType())) {
+ if (uavRouteReq.getSubDroneType() == null) {
+ uavRouteReq.setSubDroneType(0);
+ }
+ uavRouteReq.setPayloadType(Objects.equals(1, uavRouteReq.getSubDroneType())
+ ? PayloadTypeEnums.M30T.getValue() : PayloadTypeEnums.M30.getValue());
+ } else {
+ uavRouteReq.setSubDroneType(0);
+ uavRouteReq.setPayloadType(43);
+ }
uavRouteReq.setPayloadPosition(0);
uavRouteReq.setImageFormat("wide");
uavRouteReq.setFinishAction("goHome");
--
Gitblit v1.9.3