From a7aaeabc7873a0eafb4a7ecad7f65b018b7a9bc9 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 24 Feb 2023 19:31:23 +0800
Subject: [PATCH] What's new? 1. Add license for dock. 2. Modify the logic corresponding to the firmware file and device type. 3. Add multiple mqtt clients options. 4. Modify the structure of the interface for obtaining the device list. 5. Fixed some issues.
---
src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 7 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 4dc78d9..a18da9f 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
@@ -2,10 +2,16 @@
import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.PaginationData;
+import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.component.mqtt.model.CommonTopicReceiver;
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 org.springframework.messaging.MessageHeaders;
import java.sql.SQLException;
+import java.util.Collection;
+import java.util.List;
import java.util.Optional;
/**
@@ -16,27 +22,72 @@
public interface IWaylineJobService {
/**
- * Create a wayline mission for the dock.
+ * Create wayline job in the database.
* @param param
- * @param customClaim user info
+ * @param workspaceId user info
+ * @param username user info
+ * @param beginTime The time the job started.
+ * @param endTime The time the job ended.
* @return
*/
- Boolean createJob(CreateJobParam param, CustomClaim customClaim) throws SQLException;
+ Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, String workspaceId, String username, Long beginTime, Long endTime);
/**
- * Issue wayline mission to the dock for execution.
+ * Create a sub-task based on the information of the parent task.
* @param workspaceId
- * @param jobId
+ * @param parentId
* @return
*/
- void publishFlightTask(String workspaceId, String jobId) throws SQLException;
+ Optional<WaylineJobDTO> createWaylineJobByParent(String workspaceId, String parentId);
+
+ /**
+ * Issue wayline mission to the dock.
+ * @param param
+ * @param customClaim user info
+ * @return
+ */
+ ResponseResult publishFlightTask(CreateJobParam param, CustomClaim customClaim) throws SQLException;
+
+ /**
+ * Execute the task immediately.
+ * @param jobId
+ * @throws SQLException
+ * @return
+ */
+ Boolean executeFlightTask(String workspaceId, String jobId);
+
+ /**
+ * Cancel the task Base on job Ids.
+ * @param workspaceId
+ * @param jobIds
+ * @throws SQLException
+ */
+ void cancelFlightTask(String workspaceId, Collection<String> jobIds);
+
+ /**
+ * Cancel the dock tasks that have been issued but have not yet been executed.
+ * @param workspaceId
+ * @param dockSn
+ * @param jobIds
+ */
+ void publishCancelTask(String workspaceId, String dockSn, List<String> jobIds);
+
+ /**
+ * Query wayline jobs based on conditions.
+ * @param workspaceId
+ * @param jobIds
+ * @param status
+ * @return
+ */
+ List<WaylineJobDTO> getJobsByConditions(String workspaceId, Collection<String> jobIds, WaylineJobStatusEnum status);
/**
* Query job information based on job id.
+ * @param workspaceId
* @param jobId
* @return job information
*/
- Optional<WaylineJobDTO> getJobByJobId(String jobId);
+ Optional<WaylineJobDTO> getJobByJobId(String workspaceId, String jobId);
/**
* Update job data.
@@ -53,4 +104,18 @@
* @return
*/
PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize);
+
+ /**
+ * Process to get interface data of flight mission resources.
+ * @param receiver
+ * @param headers
+ */
+ void flightTaskResourceGet(CommonTopicReceiver receiver, MessageHeaders headers);
+
+ /**
+ * Set the media files for this job to upload immediately.
+ * @param workspaceId
+ * @param jobId
+ */
+ void uploadMediaHighestPriority(String workspaceId, String jobId);
}
--
Gitblit v1.9.3