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 | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 90d8594..a18da9f 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
@@ -5,11 +5,13 @@
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;
/**
@@ -22,10 +24,21 @@
/**
* 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
*/
- Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, CustomClaim customClaim);
+ Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, String workspaceId, String username, Long beginTime, Long endTime);
+
+ /**
+ * Create a sub-task based on the information of the parent task.
+ * @param workspaceId
+ * @param parentId
+ * @return
+ */
+ Optional<WaylineJobDTO> createWaylineJobByParent(String workspaceId, String parentId);
/**
* Issue wayline mission to the dock.
@@ -41,7 +54,7 @@
* @throws SQLException
* @return
*/
- Boolean executeFlightTask(String jobId);
+ Boolean executeFlightTask(String workspaceId, String jobId);
/**
* Cancel the task Base on job Ids.
@@ -52,11 +65,29 @@
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.
--
Gitblit v1.9.3