From 0f5b969ddd52ca43ef003867b5a6749d74b7d71d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 12 Nov 2025 17:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java
index 41cd1f5..4de644c 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java
@@ -1,6 +1,8 @@
 package com.ard.route.service;
 
+import com.ard.oss.model.MinioUploadResult;
 import com.ard.route.domain.route.ArdRouteInformation;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -34,7 +36,7 @@
      * @param ardRouteInformation 航线(kmz)
      * @return 结果
      */
-    public int insertArdRouteInformation(ArdRouteInformation ardRouteInformation);
+    public String insertArdRouteInformation(ArdRouteInformation ardRouteInformation);
 
     /**
      * 修改航线(kmz)
@@ -60,4 +62,38 @@
      */
     public int deleteArdRouteInformationById(String id);
 
+    /**
+     * 导入航线(kmz)文件
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    public MinioUploadResult uploadArdRouteInformation(MultipartFile file);
+
+    /**
+     * 根据文件名称查询航线信息
+     *
+     * @param name 文件
+     * @return 结果
+     */
+    public ArdRouteInformation selectArdRouteInformationByName(String name);
+
+    /**
+     * 修改航线分组ID
+     *
+     * @param id ID
+     * @param folderId 分组ID
+     * @return 结果
+     */
+    public int updateRouteInformationFolderId(String id,String folderId);
+
+    /**
+     * 判断行点是否在禁飞区
+     *
+     * @param longitude 经度
+     * @param latitude 纬度
+     * @return 结果
+     */
+    public Boolean selectRouteInformationNoFly(Double longitude, Double latitude);
+
 }

--
Gitblit v1.9.3