From 7077d3a7819de3229482e5a9edb4bd895ea2a49f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 29 Oct 2025 16:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 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 fcb9d7d..b9d2823 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,13 +2,18 @@
 
 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.getFileNameWithoutExtension;
 
 /**
  * 航线(kmz)Service业务层处理
@@ -99,4 +104,30 @@
         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.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;
+        }
+    }
+
 }

--
Gitblit v1.9.3