From d7fef91a4cbb702988dc820bcde82c166253ceec Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 07 Mar 2026 10:17:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
index 352d034..82fa244 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
@@ -37,7 +37,6 @@
import static com.ard.route.util.RouteFileUtils.*;
import static com.ard.route.util.ToolUtils.*;
-import static com.ard.route.util.UavRouteReqUtils.kmzInfoVOToUavRouteReq;
/**
* Author:xia
@@ -199,6 +198,7 @@
"application/vnd.google-earth.kmz",
new ByteArrayInputStream(baos.toByteArray())
);
+ // 上传文件
String kmzFilePath = ossService.upload(kmzPath,multipartFile);
result.setPath(kmzFilePath);
return result;
@@ -236,7 +236,7 @@
*/
@Override
public UavRouteReq kmzInfoVoToUavRouteReq(KmzInfoVo kmzInfoVo) {
- return kmzInfoVOToUavRouteReq(kmzInfoVo);
+ return kmzInfoVoToUavRouteReq(kmzInfoVo);
}
}
--
Gitblit v1.9.3