From 74d1c21ebb6b3b916904d95d13d289df23dcdedd Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 5a51059..c928465 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
@@ -55,7 +55,7 @@
* @return
*/
Integer saveWaylineFile(String workspaceId, WaylineFileDTO metadata);
- Integer saveWaylineFiles(String workspaceId, WaylineFileDTO metadata,String patchesId,String isTemp);
+ Integer saveWaylineFiles(String workspaceId, WaylineFileDTO metadata,String patchesId,String isTemp,int waylineType);
/**
* Updates whether the file is collected or not based on the passed parameters.
* @param workspaceId
@@ -87,7 +87,7 @@
* @param creator
* @return
*/
- String importKmzFile(MultipartFile file, String workspaceId, String creator,String patchesId,String isTemp);
+ String importKmzFile(MultipartFile file, String workspaceId, String creator, String patchesId,String isTemp,int waylineType);
/**
@@ -97,9 +97,9 @@
* @param creator
* @return
*/
- WaylineFileDTO importKmzFileBack (MultipartFile file, String workspaceId, String creator);
+ WaylineFileDTO importKmzFileBack(MultipartFile file, String workspaceId, String creator,int waylineType);
WaylineFileEntity selectByName(String name);
- WaylineFileDTO importPlaneKmzFile (MultipartFile file, String workspaceId, String creator,String newName,String id);
+ WaylineFileDTO importPlaneKmzFile(MultipartFile file, String workspaceId, String creator,String newName,String id,int waylineType);
List<WaylineListDTO> waylineList(String workspaceId,String droneName);
int updateWayline(WaylineFileEntity entity);
--
Gitblit v1.9.3