From 2705061ebd89a2ad3fd4186251d2e36d86c4bb21 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 17 Nov 2025 09:22:46 +0800
Subject: [PATCH] 1.修改。
---
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
index 9cbc064..7eac98f 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
@@ -4,13 +4,14 @@
import cn.hutool.core.collection.CollectionUtil;
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.constant.FileTypeConstants;
-import com.ard.route.domain.RoutePointReq;
-import com.ard.route.domain.UavRouteReq;
-import com.ard.route.domain.WaypointHeadingReq;
-import com.ard.route.domain.WaypointTurnReq;
+import com.ard.route.domain.djuav.RoutePointReq;
+import com.ard.route.domain.djuav.UavRouteReq;
+import com.ard.route.domain.djuav.WaypointHeadingReq;
+import com.ard.route.domain.djuav.WaypointTurnReq;
+import com.ard.route.domain.djuav.kml.*;
import com.ard.route.domain.kml.*;
import com.ard.route.domain.route.ArdRouteInfo;
-import com.ard.route.domain.vo.KmzInfoVO;
+import com.ard.route.domain.vo.KmzInfoVo;
import com.ard.route.domain.vo.KmzResultVo;
import com.ard.route.enums.kml.ExitOnRCLostEnums;
import com.ard.route.service.IArdRouteInfoService;
@@ -67,7 +68,7 @@
}
// 获取文件
- String minioUrlName = subStringMinioUrlName(routeInformation.getUpPath());
+ String minioUrlName = subStringMinioUrlName(routeInformation.getPath());
try (InputStream inputStream = ossService.getObject(kmzPath,minioUrlName);
ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
ArchiveEntry entry;
@@ -194,7 +195,7 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
- result.setUpPath(localFilePath + fileName + ".kmz");
+ result.setPath(localFilePath + fileName + ".kmz");
return result;
}else {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -221,7 +222,7 @@
new ByteArrayInputStream(baos.toByteArray())
);
String kmzFilePath = ossService.upload(kmzPath,multipartFile);
- result.setUpPath(kmzFilePath);
+ result.setPath(kmzFilePath);
return result;
} catch (Exception e) {
throw new RuntimeException("KMZ文件生成或上传失败", e);
@@ -233,8 +234,8 @@
* 解析kmz文件
*/
@Override
- public KmzInfoVO parseKmz(String fileUrl){
- KmzInfoVO kmzInfoVO = new KmzInfoVO();
+ public KmzInfoVo parseKmz(String fileUrl){
+ KmzInfoVo kmzInfoVO = new KmzInfoVo();
try (InputStream inputStream = ossService.getObject(kmzPath,fileUrl);
ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
ArchiveEntry entry;
@@ -264,7 +265,7 @@
}
// 获取文件
- String minioUrl = subStringMinioUrlName(routeInformation.getUpPath());
+ String minioUrl = subStringMinioUrlName(routeInformation.getPath());
try (InputStream inputStream = ossService.getObject(kmzPath,minioUrl);
ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
ArchiveEntry entry;
--
Gitblit v1.9.3