From d76f8e3b59969d4bf0f1bf4c92730719bd5389d3 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 28 Nov 2025 16:54:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
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..4d0faaa 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
@@ -153,8 +153,8 @@
return 0;
}
ardRouteInfo.setPath(kmzResult.getPath());
+ ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
}
- ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
return ardRouteInfoMapper.updateArdRouteInfo(ardRouteInfo);
}
@@ -176,7 +176,12 @@
// 删除航线(kmz)文件
for (String id : ids) {
ArdRouteInfo information = ardRouteInfoMapper.selectArdRouteInfoById(id);
- ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
+ if (information.getPath() != null){
+ ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
+ }
+ if (information.getPath1() != null){
+ ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
+ }
}
return ardRouteInfoMapper.deleteArdRouteInfoByIds(ids);
}
@@ -209,6 +214,8 @@
information.setPath1(urlDock);
information.setGroupId("0"); // 默认分组
information.setReadOnly("1"); // 默认只读
+ // 生成kmz文件实体类加工
+
// 增加航线实体类信息
insertRouteInfomation(information);
return MinioUploadResult.builder()
@@ -486,6 +493,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