From faedd5d2f0ee850464f0507da93c37459bd5e3bb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 26 Sep 2023 16:30:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java b/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
index 941890d..4a722c8 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
@@ -1,11 +1,14 @@
package com.dji.sample.wayline.service;
import com.dji.sample.common.model.PaginationData;
-import com.dji.sample.wayline.model.WaylineFileDTO;
-import com.dji.sample.wayline.model.WaylineQueryParam;
+import com.dji.sample.wayline.model.dto.WaylineFileDTO;
+import com.dji.sample.wayline.model.param.WaylineQueryParam;
+import org.springframework.web.multipart.MultipartFile;
import java.net.URL;
+import java.sql.SQLException;
import java.util.List;
+import java.util.Optional;
/**
* @author sean
@@ -28,15 +31,15 @@
* @param waylineId
* @return
*/
- WaylineFileDTO getWaylineByWaylineId(String workspaceId, String waylineId);
+ Optional<WaylineFileDTO> getWaylineByWaylineId(String workspaceId, String waylineId);
/**
* Get the download address of the file object.
- * @param bucket bucket name
- * @param objectKey object name
+ * @param workspaceId
+ * @param waylineId
* @return
*/
- URL getObjectUrl(String bucket, String objectKey);
+ URL getObjectUrl(String workspaceId, String waylineId) throws SQLException;
/**
* Save the basic information of the wayline file.
@@ -62,4 +65,20 @@
* @return
*/
List<String> getDuplicateNames(String workspaceId, List<String> names);
+
+ /**
+ * Delete the wayline file based on the wayline id.
+ * @param workspaceId
+ * @param waylineId
+ */
+ Boolean deleteByWaylineId(String workspaceId, String waylineId);
+
+ /**
+ * Import kmz wayline file.
+ * @param file
+ * @param workspaceId
+ * @param creator
+ * @return
+ */
+ void importKmzFile(MultipartFile file, String workspaceId, String creator);
}
--
Gitblit v1.9.3