From fc67c10698ab266a57916fef00828369e1c258de Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Thu, 18 May 2023 17:42:23 +0800
Subject: [PATCH] What's new? 1. Add new model: DJI Matrices 350 RTK. 2. Update file hms.json. 3. Fixed some issues.

---
 src/main/java/com/dji/sample/wayline/service/IWaylineRedisService.java |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dji/sample/wayline/service/IWaylineRedisService.java b/src/main/java/com/dji/sample/wayline/service/IWaylineRedisService.java
index fa2b99b..0f8408c 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineRedisService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineRedisService.java
@@ -1,8 +1,8 @@
 package com.dji.sample.wayline.service;
 
 import com.dji.sample.component.mqtt.model.EventsReceiver;
-import com.dji.sample.wayline.model.dto.ConditionalWaylineJobKey;
 import com.dji.sample.wayline.model.dto.WaylineJobDTO;
+import com.dji.sample.wayline.model.dto.WaylineJobKey;
 import com.dji.sample.wayline.model.dto.WaylineTaskProgressReceiver;
 
 import java.util.Optional;
@@ -71,6 +71,13 @@
     String getBlockedWaylineJobId(String dockSn);
 
     /**
+     * Delete the wayline job id blocked by the dock in redis.
+     * @param dockSn
+     * @return
+     */
+    Boolean delBlockedWaylineJobId(String dockSn);
+
+    /**
      * Save the conditional wayline job by the dock to redis.
      * @param waylineJob
      */
@@ -90,11 +97,30 @@
      */
     Boolean delConditionalWaylineJob(String jobId);
 
-    Boolean addPrepareConditionalWaylineJob(WaylineJobDTO waylineJob);
+    /**
+     * Add the wayline job that needs to be issued.
+     * @param waylineJob
+     * @return
+     */
+    Boolean addPreparedWaylineJob(WaylineJobDTO waylineJob);
 
-    Optional<ConditionalWaylineJobKey> getNearestConditionalWaylineJob();
+    /**
+     * Get the latest wayline job that needs to be issued.
+     * @return
+     */
+    Optional<WaylineJobKey> getNearestPreparedWaylineJob();
 
-    Double getConditionalWaylineJobTime(ConditionalWaylineJobKey jobKey);
+    /**
+     * Get the time when the wayline job is issued.
+     * @param jobKey
+     * @return
+     */
+    Double getPreparedWaylineJobTime(WaylineJobKey jobKey);
 
-    Boolean removePrepareConditionalWaylineJob(ConditionalWaylineJobKey jobKey);
+    /**
+     * Delete the wayline job that needs to be issued in redis.
+     * @param jobKey
+     * @return
+     */
+    Boolean removePreparedWaylineJob(WaylineJobKey jobKey);
 }

--
Gitblit v1.9.3