From c42829d221533c790799c008f9dd297708335c30 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 10 Nov 2025 16:54:08 +0800
Subject: [PATCH] 1.增加修改航线分组ID接口。 2.Minio格式优化。 3.分组管理查询列表优化。 4.航线信息增加航线类型字段。 5.修改航线(kmz)功能优化。 6.增加定制删除旧的文件名的文件，并添加新文件名的文件接口。
---
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 200 insertions(+), 9 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 33b596b..5192cc9 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,39 +3,77 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.io.FileUtil;
+import com.ard.common.utils.SecurityUtils;
+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.kml.*;
+import com.ard.route.domain.route.ArdRouteInformation;
+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.IArdRouteInformationService;
+import com.ard.route.util.FileUtils;
+import com.ard.route.util.InitializationUtils;
import com.ard.route.util.RouteFileUtils;
import com.ard.route.service.UavRouteService;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveInputStream;
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.Value;
+import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
-import java.io.File;
+import javax.annotation.Resource;
+import java.io.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.zip.ZipOutputStream;
+
+import static com.ard.route.util.RouteFileUtils.*;
+import static com.ard.route.util.ToolUtils.*;
/**
- * Author:songjian
+ * Author:xia
* Date: 2024/12/22 10:36
**/
@Service
public class UavRouteServiceImpl implements UavRouteService {
+ @Resource
+ private OssServiceContext ossService;
+
+ @Resource
+ private IArdRouteInformationService ardRouteInformationService;
+
+ InitializationUtils init = new InitializationUtils();
+
+ /**
+ * 编辑kmz文件
+ */
@Override
- public void updateKmz(UavRouteReq uavRouteReq) {
- // TODO 替换本地文件路径！！！
- File file = FileUtil.file("/Users/songjian/Project/IdeaProjects/dj-uav/file/kmz/航线kmz文件.kmz");
- try (ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(FileUtil.getInputStream(file))) {
+ public KmzResultVo updateKmz(UavRouteReq uavRouteReq,String fileName){
+ KmzResultVo result = new KmzResultVo();
+ // 校验修改的文件是否存在
+ ArdRouteInformation routeInformation = ardRouteInformationService.selectArdRouteInformationByName(fileName);
+ if ( routeInformation == null ){
+ result.setData("修改航线文件失败，请检查文件是否存在");
+ return result;
+ }
+
+ // 获取文件
+ String minioUrl = routeInformation.getMinioUpPath();
+ try (InputStream inputStream = ossService.getObject(kmzPath,minioUrl);
+ ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
ArchiveEntry entry;
KmlInfo kmlInfo = new KmlInfo();
KmlInfo wpmlInfo = new KmlInfo();
@@ -51,9 +89,13 @@
this.handleRouteUpdate(wpmlInfo, uavRouteReq, FileTypeConstants.WPML, kmlParams);
}
}
- RouteFileUtils.buildKmz("更新航线kmz文件", kmlInfo, wpmlInfo);
+ // 删除文件
+ ossService.deleteObject(kmzPath, minioUrl);
+ return buildKmzMethod(routeInformation.getFileName(), kmlInfo, wpmlInfo);
} catch (Exception e) {
e.printStackTrace();
+ result.setData("更新航线kmz文件失败");
+ return result;
}
}
@@ -98,11 +140,160 @@
}
}
+ /**
+ * 生成kmz文件(带航点)
+ */
@Override
- public void buildKmz(UavRouteReq uavRouteReq) {
+ public KmzResultVo buildKmz(UavRouteReq uavRouteReq, String fileName) {
+ // 赋值默认参数
+ init.initialization(uavRouteReq);
KmlParams kmlParams = new KmlParams();
BeanUtils.copyProperties(uavRouteReq, kmlParams);
kmlParams.setRoutePointList(BeanUtil.copyToList(uavRouteReq.getRoutePointList(), RoutePointInfo.class));
- RouteFileUtils.buildKmz("航线kmz文件AAAAAA", kmlParams);
+ return buildKmz(fileName, kmlParams);
}
+
+ /**
+ * 生成航线 KMZ 文件
+ *
+ * @param fileName 文件名
+ * @param kmlParams 参数对象
+ * @return 本地文件路径
+ */
+ public KmzResultVo buildKmz(String fileName, KmlParams kmlParams) {
+ KmlInfo kmlInfo = buildKml(kmlParams);
+ KmlInfo wpmlInfo = buildWpml(kmlParams);
+ return buildKmzMethod(fileName, kmlInfo, wpmlInfo);
+ }
+
+ /**
+ * 生成航线 KMZ 文件
+ *
+ * @param fileName 文件名
+ * @param kmlInfo kml 文件信息
+ * @param wpmlInfo wpml 文件信息
+ * @return 本地文件路径
+ */
+ public KmzResultVo buildKmzMethod(String fileName, KmlInfo kmlInfo, KmlInfo wpmlInfo) {
+ XStream xStream = new XStream(new DomDriver());
+ xStream.processAnnotations(KmlInfo.class);
+ xStream.addImplicitCollection(KmlActionGroup.class, "action");
+ xStream.addImplicitCollection(KmlPlacemark.class, "actionGroup");
+
+ String kml = XML_HEADER + xStream.toXML(kmlInfo);
+ String wpml = XML_HEADER + xStream.toXML(wpmlInfo);
+
+ KmzResultVo result = new KmzResultVo();
+
+ // 判断本地生成kmz文件
+ if (isLocal) {
+ try (FileOutputStream fileOutputStream = new FileOutputStream(localFilePath + fileName + ".kmz");
+ ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream)) {
+ zipOutputStream.setLevel(0); // 0 表示不压缩，存储方式
+
+ // 创建KMZ文件内容
+ buildZipFile("wpmz/template.kml", zipOutputStream, kml);
+ buildZipFile("wpmz/waylines.wpml", zipOutputStream, wpml);
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ result.setUpPath(localFilePath + fileName + ".kmz");
+ return result;
+ }else {
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ZipOutputStream zipOutputStream = new ZipOutputStream(baos)) {
+ zipOutputStream.setLevel(0);
+
+ // 创建KMZ文件内容
+ buildZipFile("wpmz/template.kml", zipOutputStream, kml);
+ buildZipFile("wpmz/waylines.wpml", zipOutputStream, wpml);
+
+ zipOutputStream.finish();
+ zipOutputStream.flush();
+
+ // 获取文件大小
+ Double fileSize = (double) baos.size(); // 字节数
+
+ // 创建MultipartFile对象
+ MultipartFile multipartFile = new MockMultipartFile(
+ fileName + ".kmz",
+ fileName + ".kmz",
+ "application/vnd.google-earth.kmz",
+ new ByteArrayInputStream(baos.toByteArray())
+ );
+ String kmzFilePath = ossService.upload(kmzPath,multipartFile);
+ result.setFileNameNew(getFileNameWithoutExtension(kmzFilePath));
+ result.setMinioUpPath(extractFilePath(kmzFilePath));
+ result.setUpPath(kmzFilePath);
+ result.setUpFileSize(fileSize);
+ return result;
+ } catch (Exception e) {
+ throw new RuntimeException("KMZ文件生成或上传失败", e);
+ }
+ }
+ }
+
+ /**
+ * 解析kmz文件
+ */
+ @Override
+ public KmzInfoVO parseKmz(String fileUrl){
+ KmzInfoVO kmzInfoVO = new KmzInfoVO();
+ try (InputStream inputStream = ossService.getObject(kmzPath,fileUrl);
+ ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
+ ArchiveEntry entry;
+ while (!Objects.isNull(entry = archiveInputStream.getNextEntry())) {
+ String name = entry.getName();
+ if (name.toLowerCase().endsWith(".kml")) {
+ kmzInfoVO.setKmlInfo(RouteFileUtils.parseKml(archiveInputStream));
+ } else if (name.toLowerCase().endsWith(".wpml")) {
+ kmzInfoVO.setWpmlInfo(RouteFileUtils.parseKml(archiveInputStream));
+ }
+ }
+ return kmzInfoVO;
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ public KmzResultVo updateKmzNew(UavRouteReq uavRouteReq, String oldFile, String newFile) {
+ KmzResultVo result = new KmzResultVo();
+ // 校验修改的文件是否存在
+ ArdRouteInformation routeInformation = ardRouteInformationService.selectArdRouteInformationByName(oldFile);
+ if ( routeInformation == null ){
+ result.setData("修改航线文件失败，请检查文件是否存在");
+ return result;
+ }
+
+ // 获取文件
+ String minioUrl = routeInformation.getMinioUpPath();
+ 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;
+ }
+ }
+
}
--
Gitblit v1.9.3