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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 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 a05968e..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
@@ -2,12 +2,19 @@
import java.util.List;
import com.ard.common.utils.DateUtils;
+import com.ard.common.utils.file.FileUtils;
import com.ard.common.utils.uuid.IdUtils;
+import com.ard.oss.model.MinioUploadResult;
+import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.domain.route.ArdRouteInformation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteInformationMapper;
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;
/**
* 航线(kmz)Service业务层处理
@@ -20,6 +27,9 @@
@Autowired
private ArdRouteInformationMapper ardRouteInformationMapper;
+
+ @Autowired
+ private OssServiceContext ossService;
/**
* 查询航线(kmz)
@@ -76,6 +86,11 @@
*/
@Override
public int deleteArdRouteInformationByIds(String[] ids) {
+ // 删除航线(kmz)文件
+ for (String id : ids) {
+ ArdRouteInformation information = ardRouteInformationMapper.selectArdRouteInformationById(id);
+ ossService.deleteObject("kmz", information.getMinioUpPath());
+ }
return ardRouteInformationMapper.deleteArdRouteInformationByIds(ids);
}
@@ -90,4 +105,42 @@
return ardRouteInformationMapper.deleteArdRouteInformationById(id);
}
+ /**
+ * 导入航线(kmz)文件
+ *
+ * @param file 文件
+ * @return 结果
+ */
+ @Override
+ public MinioUploadResult uploadArdRouteInformation(MultipartFile file) {
+ try {
+ String url = ossService.upload("kmz",file);
+ 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);
+ return MinioUploadResult.builder()
+ .url(url)
+ .newFileName(FileUtils.getName(url))
+ .originalFilename(file.getOriginalFilename())
+ .build();
+ }catch (Exception e){
+ return null;
+ }
+ }
+
+ /**
+ * 根据文件名称查询航线信息
+ *
+ * @param name 文件名称
+ * @return 结果
+ */
+ @Override
+ public ArdRouteInformation selectArdRouteInformationByName(String name) {
+ return ardRouteInformationMapper.selectArdRouteInformationByName(name);
+ }
+
}
--
Gitblit v1.9.3