From 2acf49278129e5870d8b775519a2bc1461294fb8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 11 Mar 2026 08:55:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 933fe99..cf56316 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
@@ -39,12 +39,13 @@
import com.ard.work.service.ITyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
-import static com.ard.route.util.InitializationUtils.divided_23;
+import static com.ard.route.util.InitializationUtils.divided23;
import static com.ard.route.util.ToolUtils.*;
import static com.ard.route.util.UavRouteReqUtils.buildWayLineUploadDTO;
import static com.ard.route.util.UavRouteReqUtils.fileConversionEntity;
@@ -95,8 +96,18 @@
ArdRouteInfo ardRouteInfo = ardRouteInfoMapper.selectArdRouteInfoById(id);
try {
if (ardRouteInfo != null) {
- if (ardRouteInfo.getRouteData() != null){
- ardRouteInfo.setUavRouteReq((UavRouteReq) deserialize(ardRouteInfo.getRouteData()));
+ if ("3".equals(ardRouteInfo.getType())) {
+ if (ardRouteInfo.getRouteData() != null){
+ UavRouteReq uavRouteReq = new UavRouteReq();
+ BeanUtils.copyProperties(deserialize(ardRouteInfo.getRouteData()), uavRouteReq);
+ ardRouteInfo.setUavRouteReq(uavRouteReq);
+ }
+ } else {
+ if (ardRouteInfo.getRouteData() != null){
+ ardRouteInfo.setUavRouteReq((UavRouteReq) deserialize(ardRouteInfo.getRouteData()));
+ }
+ }
+ if (ardRouteInfo.getCloudData() != null){
ardRouteInfo.setArdPointCloudList(deserializeLs(ardRouteInfo.getCloudData()));
}
}
@@ -274,7 +285,7 @@
for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
for (PointActionReq action : actionGroupReq.getActions()) {
if (action.getZoom() != null){
- action.setZoom(divided_23(action.getZoom()));
+ action.setZoom(divided23(action.getZoom()));
}
}
}
@@ -454,8 +465,17 @@
// 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()));
- route.setArdPointCloudList(deserializeLs(route.getRouteData()));
+ if (route.getCloudData() != null){
+ route.setArdPointCloudList(deserializeLs(route.getCloudData()));
+ }
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
--
Gitblit v1.9.3