From d4447ca99df2cfe978ca51790dd2891e9df0d492 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 25 Jul 2024 16:19:05 +0800
Subject: [PATCH] 修改人工拍照图片保存,新增面状航线保存、修改接口,图斑文件上传格式修改
---
src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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..1f1d401 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,16 @@
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.dto.WaylineListDTO;
+import com.dji.sample.wayline.model.entity.WaylineFileEntity;
+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
@@ -22,21 +27,26 @@
*/
PaginationData<WaylineFileDTO> getWaylinesByParam(String workspaceId, WaylineQueryParam param);
+ PaginationData<WaylineFileDTO> getShowWaylinesByParam(String workspaceId, WaylineQueryParam param);
+
+
+
+ String getPatchesId(String waylineId);
/**
* Query the information of this wayline file according to the wayline file id.
* @param workspaceId
* @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.
@@ -45,7 +55,7 @@
* @return
*/
Integer saveWaylineFile(String workspaceId, WaylineFileDTO metadata);
-
+ Integer saveWaylineFiles(String workspaceId, WaylineFileDTO metadata,String patchesId,String isTemp);
/**
* Updates whether the file is collected or not based on the passed parameters.
* @param workspaceId
@@ -62,4 +72,35 @@
* @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
+ */
+ String importKmzFile(MultipartFile file, String workspaceId, String creator,String patchesId,String isTemp);
+
+
+ /**
+ * 创建航线,返回航线对象
+ * @param file
+ * @param workspaceId
+ * @param creator
+ * @return
+ */
+ WaylineFileDTO importKmzFileBack (MultipartFile file, String workspaceId, String creator);
+ WaylineFileEntity selectByName(String name);
+ WaylineFileDTO importPlaneKmzFile (MultipartFile file, String workspaceId, String creator,String newName,String id);
+ List<WaylineListDTO> waylineList(String workspaceId,String droneName);
+
+ int updateWayline(WaylineFileEntity entity);
}
--
Gitblit v1.9.3