From 4fafee90e483bb10e092186a9b07b8cc356dbdb2 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 11 Jun 2026 14:49:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev
---
ard-sample/src/main/java/com/ard/sample/wayline/service/IWaylineJobService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/IWaylineJobService.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/IWaylineJobService.java
index 782f22e..19af6f3 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/IWaylineJobService.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/IWaylineJobService.java
@@ -58,17 +58,18 @@
/**
* Cancel the task Base on job Ids.
- * @param jobIds
+ * @param jobId
* @throws SQLException
*/
- void cancelFlightTask(Collection<String> jobIds);
+ ResponseResult cancelFlightTask(Collection<String> jobId);
+// void cancelFlightTask(Collection<String> jobIds);
/**
* Cancel the dock tasks that have been issued but have not yet been executed.
* @param dockSn
* @param jobIds
*/
- void publishCancelTask(String dockSn, List<String> jobIds);
+ ResponseResult publishCancelTask(String dockSn, List<String> jobIds);
/**
* 删除任务
--
Gitblit v1.9.3