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/IWaylineJobService.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java b/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
index a18da9f..ec04134 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
@@ -7,6 +7,8 @@
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum;
import com.dji.sample.wayline.model.param.CreateJobParam;
+import com.dji.sample.wayline.model.param.UpdateJobParam;
+import com.dji.sample.wayline.model.param.WaylineJobQueryParam;
import org.springframework.messaging.MessageHeaders;
import java.sql.SQLException;
@@ -47,6 +49,14 @@
* @return
*/
ResponseResult publishFlightTask(CreateJobParam param, CustomClaim customClaim) throws SQLException;
+
+ /**
+ * Issue wayline mission to the dock.
+ * @param waylineJob
+ * @return
+ * @throws SQLException
+ */
+ ResponseResult publishOneFlightTask(WaylineJobDTO waylineJob) throws SQLException;
/**
* Execute the task immediately.
@@ -103,7 +113,7 @@
* @param pageSize
* @return
*/
- PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize);
+ PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam);
/**
* Process to get interface data of flight mission resources.
@@ -118,4 +128,19 @@
* @param jobId
*/
void uploadMediaHighestPriority(String workspaceId, String jobId);
+
+ /**
+ * Manually control the execution status of wayline job.
+ * @param workspaceId
+ * @param jobId
+ * @param param
+ */
+ void updateJobStatus(String workspaceId, String jobId, UpdateJobParam param);
+
+ /**
+ * Query the wayline execution status of the dock.
+ * @param dockSn
+ * @return
+ */
+ WaylineJobStatusEnum getWaylineState(String dockSn);
}
--
Gitblit v1.9.3