From b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 12:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index cf56316..0d79c69 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -169,6 +169,11 @@
if (ardRouteInfo.getGroupId() == null){
ardRouteInfo.setGroupId("0");
}
+ if ("3".equals(ardRouteInfo.getType())){
+ ardRouteInfo.getUavRouteReq().setHeightMode("EGM96");
+ }else {
+ ardRouteInfo.getUavRouteReq().setHeightMode("relativeToStartPoint");
+ }
ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(),ardRouteInfo.getName());
zoomProcessing(ardRouteInfo);
@@ -465,13 +470,6 @@
// 1.1通过航线数据，转换。
ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(id);
try {
-// if ("3".equals(route.getType())) {
-// UavRouteReq uavRouteReq = new UavRouteReq();
-// BeanUtils.copyProperties(deserialize(route.getRouteData()), uavRouteReq);
-// route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData()));
-// }else {
-// route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData()));
-// }
route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData()));
if (route.getCloudData() != null){
route.setArdPointCloudList(deserializeLs(route.getCloudData()));
--
Gitblit v1.9.3