From 112575460343cd47e509754887fc06e256f5a5e5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 27 Nov 2025 10:14:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev
---
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java | 4 ++--
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 4 ++++
ard-admin/src/main/resources/application-prod.yml | 14 +-------------
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index e5a29ab..ddf5c35 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -80,23 +80,11 @@
region: us-east-1
object-dir-prefix: wayline
- # 机场oss配置
- ossdock:
- enable: true
- provider: minio
- endpoint: https://192.168.1.3:9011
- access-key: admin2
- secret-key: ard123456
- bucket: cloud-bucket
- expire: 3600
- region: us-east-1
- object-dir-prefix: wayline
-
# 机场单独用的oss配置，要http地址
ossdock:
enable: true
provider: minio
- endpoint: http://192.168.10.103:9011
+ endpoint: http://192.168.1.3:9011
access-key: admin2
secret-key: ard123456
bucket: cloud-bucket
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
index 038cb92..8b32204 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
@@ -29,8 +29,8 @@
@Excel(name = "文件路径")
private String path;
- /** 文件路径2 */
- @Excel(name = "文件路径2")
+ /** 文件路径1 */
+ @Excel(name = "文件路径1")
private String path1;
/** 分组ID */
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index 5ff6f86..c89d015 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -177,6 +177,7 @@
for (String id : ids) {
ArdRouteInfo information = ardRouteInfoMapper.selectArdRouteInfoById(id);
ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
+ ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
}
return ardRouteInfoMapper.deleteArdRouteInfoByIds(ids);
}
@@ -209,6 +210,8 @@
information.setPath1(urlDock);
information.setGroupId("0"); // 默认分组
information.setReadOnly("1"); // 默认只读
+ // 生成kmz文件实体类加工
+
// 增加航线实体类信息
insertRouteInfomation(information);
return MinioUploadResult.builder()
@@ -486,6 +489,7 @@
private void insertRouteInfomation(ArdRouteInfo ardRouteInfo){
ardRouteInfo.setId(IdUtils.simpleUUID());
ardRouteInfo.setCreateTime(DateUtils.getNowDate());
+ ardRouteInfo.setUpdateTime(DateUtils.getNowDate());
ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
}
--
Gitblit v1.9.3