From e6292018a3b5a128a77b32b97b25af50d8bcd2f7 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 03 Nov 2025 11:11:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 b9d2823..d9a288a 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
@@ -13,6 +13,7 @@
import com.ard.route.service.IArdRouteInformationService;
import org.springframework.web.multipart.MultipartFile;
+import static com.ard.route.util.ToolUtils.extractFilePath;
import static com.ard.route.util.ToolUtils.getFileNameWithoutExtension;
/**
@@ -88,7 +89,7 @@
// 删除航线(kmz)文件
for (String id : ids) {
ArdRouteInformation information = ardRouteInformationMapper.selectArdRouteInformationById(id);
- ossService.deleteObject("kmz", information.getUpPath());
+ ossService.deleteObject("kmz", information.getMinioUpPath());
}
return ardRouteInformationMapper.deleteArdRouteInformationByIds(ids);
}
@@ -117,6 +118,7 @@
ArdRouteInformation information = new ArdRouteInformation();
information.setFileName(file.getOriginalFilename());
information.setFileNameNew(getFileNameWithoutExtension(url));
+ information.setMinioUpPath(extractFilePath(url));
information.setUpPath(url);
information.setUpFileSize((double) file.getSize());
insertArdRouteInformation(information);
@@ -130,4 +132,15 @@
}
}
+ /**
+ * 根据文件名称查询航线信息
+ *
+ * @param name 文件名称
+ * @return 结果
+ */
+ @Override
+ public ArdRouteInformation selectArdRouteInformationByName(String name) {
+ return ardRouteInformationMapper.selectArdRouteInformationByName(name);
+ }
+
}
--
Gitblit v1.9.3