From 2acf49278129e5870d8b775519a2bc1461294fb8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 11 Mar 2026 08:55:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/service/UavRouteService.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/service/UavRouteService.java b/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
index dbc1984..c21566f 100644
--- a/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
+++ b/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
@@ -1,10 +1,8 @@
 package com.ard.route.service;
 
-import com.ard.route.domain.UavRouteReq;
-import com.ard.route.domain.vo.KmzInfoVO;
+import com.ard.route.domain.djuav.UavRouteReq;
+import com.ard.route.domain.vo.KmzInfoVo;
 import com.ard.route.domain.vo.KmzResultVo;
-
-import java.io.IOException;
 
 
 public interface UavRouteService {
@@ -22,12 +20,11 @@
     /**
      * 解析kmz文件
      */
-    public KmzInfoVO parseKmz(String file);
+    public KmzInfoVo parseKmz(String file);
 
     /**
-     * 编辑kmz文件
-     * 定制:删除旧的文件名的文件,并添加新文件名的文件
+     * KmzInfoVo实体类转换为UavRouteReq实体类
      */
-    public KmzResultVo updateKmzNew(UavRouteReq uavRouteReq, String oldFileName, String newFilePath) ;
+    public UavRouteReq kmzInfoVoToUavRouteReq(KmzInfoVo kmzInfoVo);
 
 }

--
Gitblit v1.9.3