From c3b9669d67b5928757e6ad9c3b8215070cef344e Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 01 Dec 2025 11:25:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 41 ++++++-----------------------------------
1 files changed, 6 insertions(+), 35 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 1a8b76e..352d034 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
@@ -37,6 +37,7 @@
import static com.ard.route.util.RouteFileUtils.*;
import static com.ard.route.util.ToolUtils.*;
+import static com.ard.route.util.UavRouteReqUtils.kmzInfoVOToUavRouteReq;
/**
* Author:xia
@@ -230,42 +231,12 @@
return null;
}
+ /**
+ * KmzInfoVo实体类转换为UavRouteReq实体类
+ */
@Override
- public KmzResultVo updateKmzNew(UavRouteReq uavRouteReq, String oldFile, String newFile) {
- KmzResultVo result = new KmzResultVo();
- // 校验修改的文件是否存在
- ArdRouteInfo routeInformation = ardRouteInformationService.selectArdRouteInfoByName(oldFile);
- if ( routeInformation == null ){
- result.setData("修改航线文件失败，请检查文件是否存在");
- return result;
- }
-
- // 获取文件
- String minioUrl = subStringMinioUrlName(routeInformation.getPath());
- try (InputStream inputStream = ossService.getObject(kmzPath,minioUrl);
- ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
- ArchiveEntry entry;
- KmlInfo kmlInfo = new KmlInfo();
- KmlInfo wpmlInfo = new KmlInfo();
- KmlParams kmlParams = new KmlParams();
- while (!Objects.isNull(entry = archiveInputStream.getNextEntry())) {
- String name = entry.getName();
- if (name.toLowerCase().endsWith(".kml")) {
- kmlInfo = RouteFileUtils.parseKml(archiveInputStream);
- buildKmlParams(kmlParams, kmlInfo);
- this.handleRouteUpdate(kmlInfo, uavRouteReq, FileTypeConstants.KML, kmlParams);
- } else if (name.toLowerCase().endsWith(".wpml")) {
- wpmlInfo = RouteFileUtils.parseKml(archiveInputStream);
- this.handleRouteUpdate(wpmlInfo, uavRouteReq, FileTypeConstants.WPML, kmlParams);
- }
- }
- // 删除文件
- ossService.deleteObject(kmzPath, minioUrl);
- return buildKmzMethod(newFile, kmlInfo, wpmlInfo);
- } catch (Exception e) {
- result.setData("更新航线kmz文件失败");
- return result;
- }
+ public UavRouteReq kmzInfoVoToUavRouteReq(KmzInfoVo kmzInfoVo) {
+ return kmzInfoVOToUavRouteReq(kmzInfoVo);
}
}
--
Gitblit v1.9.3