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/ArdRouteInformationServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
index d7b9899..c199ee5 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
@@ -70,17 +70,11 @@
public String insertArdRouteInformation(ArdRouteInformation ardRouteInformation) {
ardRouteInformation.setId(IdUtils.simpleUUID());
ardRouteInformation.setCreateTime(DateUtils.getNowDate());
-
- if (ardRouteInformation.getUavRouteReq() != null){
-
+ if (ardRouteInformation.getFolderId() == null){
+ ardRouteInformation.setFolderId("0");
}
KmzResultVo kmzResult = routeService.buildKmz(ardRouteInformation.getUavRouteReq(), ardRouteInformation.getFileName());
- // 将KmzResult中的信息设置到ardRouteInformation中
- ardRouteInformation.setFileNameNew(kmzResult.getFileNameNew());
- ardRouteInformation.setMinioUpPath(kmzResult.getMinioUpPath());
- ardRouteInformation.setUpPath(kmzResult.getUpPath());
- ardRouteInformation.setUpFileSize(kmzResult.getUpFileSize());
- ardRouteInformationMapper.insertArdRouteInformation(ardRouteInformation);
+ ardRouteInformationMapper.insertArdRouteInformation(assembly(ardRouteInformation,kmzResult));
return kmzResult.getUpPath();
}
@@ -93,7 +87,27 @@
@Override
public int updateArdRouteInformation(ArdRouteInformation ardRouteInformation) {
ardRouteInformation.setUpdateTime(DateUtils.getNowDate());
- return ardRouteInformationMapper.updateArdRouteInformation(ardRouteInformation);
+ KmzResultVo kmzResult = new KmzResultVo();
+ // 获取源文件名字
+ ArdRouteInformation route = ardRouteInformationMapper.selectArdRouteInformationById(ardRouteInformation.getId());
+ if (route.getFileName().equals(ardRouteInformation.getFileName())) {
+ kmzResult = routeService.updateKmz(ardRouteInformation.getUavRouteReq(), ardRouteInformation.getFileName());
+ }else {
+ kmzResult = routeService.updateKmzNew(ardRouteInformation.getUavRouteReq(), route.getFileName(),ardRouteInformation.getFileName());
+ }
+ if ("更新航线kmz文件失败".equals(kmzResult.getData())) {
+ return 0;
+ }
+ return ardRouteInformationMapper.updateArdRouteInformation(assembly(ardRouteInformation,kmzResult));
+ }
+
+ //组装数据
+ private ArdRouteInformation assembly(ArdRouteInformation information,KmzResultVo kmzResult){
+ information.setFileNameNew(kmzResult.getFileNameNew());
+ information.setMinioUpPath(kmzResult.getMinioUpPath());
+ information.setUpPath(kmzResult.getUpPath());
+ information.setUpFileSize(kmzResult.getUpFileSize());
+ return information;
}
/**
@@ -139,7 +153,7 @@
information.setMinioUpPath(extractFilePath(url));
information.setUpPath(url);
information.setUpFileSize((double) file.getSize());
- insertArdRouteInformation(information);
+ insertRouteInformation(information);
return MinioUploadResult.builder()
.url(url)
.newFileName(FileUtils.getName(url))
@@ -161,4 +175,25 @@
return ardRouteInformationMapper.selectArdRouteInformationByName(name);
}
+ /**
+ * 修改航线分组ID
+ *
+ * @param id ID
+ * @param folderId 分组ID
+ * @return 结果
+ */
+ @Override
+ public int updateRouteInformationFolderId(String id, String folderId) {
+ return ardRouteInformationMapper.updateRouteInformationFolderId(id, folderId);
+ }
+
+ /**
+ * 数据新增航线信息
+ */
+ private void insertRouteInformation(ArdRouteInformation ardRouteInformation){
+ ardRouteInformation.setId(IdUtils.simpleUUID());
+ ardRouteInformation.setCreateTime(DateUtils.getNowDate());
+ ardRouteInformationMapper.insertArdRouteInformation(ardRouteInformation);
+ }
+
}
--
Gitblit v1.9.3