From d622682904bb0a4b401db317e8d0b9fdf474e54b Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 13 Dec 2025 09:00:17 +0800
Subject: [PATCH] 1. 修改发现BUG。
---
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 56 +++++++++++++++++++++-----------------------------------
1 files changed, 21 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..648be05 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
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.ard.oss.service.impl.OssServiceContext;
+import com.ard.ossdock.service.impl.OssDockServiceContext;
import com.ard.route.constant.FileTypeConstants;
import com.ard.route.domain.djuav.RoutePointReq;
import com.ard.route.domain.djuav.UavRouteReq;
@@ -24,6 +25,7 @@
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -37,6 +39,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
@@ -47,6 +50,9 @@
@Resource
private OssServiceContext ossService;
+
+ @Resource
+ private OssDockServiceContext ossDockService;
@Resource
private IArdRouteInfoService ardRouteInformationService;
@@ -86,6 +92,10 @@
}
}
// 删除文件
+ if ("100".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())
+ ||"91".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())){
+ ossDockService.deleteObject(kmzPath,minioUrlName);
+ }
ossService.deleteObject(kmzPath, minioUrlName);
return buildKmzMethod(routeInformation.getName(), kmlInfo, wpmlInfo);
} catch (Exception e) {
@@ -198,6 +208,12 @@
"application/vnd.google-earth.kmz",
new ByteArrayInputStream(baos.toByteArray())
);
+ // 通过无人机类型，判断上传文件
+ if ("100".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())
+ ||"91".equals(kmlInfo.getDocument().getKmlMissionConfig().getDroneInfo().getDroneEnumValue())){
+ String kmzFilePathDock = ossDockService.upload(kmzPath,multipartFile);
+ result.setPathDock(kmzFilePathDock);
+ }
String kmzFilePath = ossService.upload(kmzPath,multipartFile);
result.setPath(kmzFilePath);
return result;
@@ -230,42 +246,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