From a5f04d4925f77fd741abecdc37cfc6674894cefe Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 13 Dec 2025 10:54:04 +0800
Subject: [PATCH] 2025-12-13 zwy 修改机场航线文件取path,转换http地址,配置文件oss去掉endpoint-spare字段,增加dock:endpoint,增加DockConfiguration.java配置文件,删除ossdock模块
---
ard-sample/src/main/java/com/ard/sample/wayline/service/IWaylineJobService.java | 18 +++++++++++++++---
1 files changed, 15 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 1e35fe1..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
@@ -46,6 +46,8 @@
*/
ResponseResult publishFlightTask(CreateJobParam param, LoginUser loginUser) throws SQLException;
+ ResponseResult publishFlightTaskPrepare(Optional<WaylineJobDTO> waylineJobOpt) throws SQLException;
+
/**
* Execute the task immediately.
* @param jobId
@@ -56,17 +58,23 @@
/**
* 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);
+
+ /**
+ * 删除任务
+ * */
+ void deleteTask(String id);
/**
* Query wayline jobs based on conditions.
@@ -98,6 +106,10 @@
*/
PaginationData<WaylineJobDTO> getJobsByWorkspaceId(long page, long pageSize);
+ PaginationData<WaylineJobDTO> getJobsList(long page, long pageSize, Integer status,
+ Long startTime, Long endTime, Integer taskType,
+ String name, Boolean isComplete);
+
/**
* Process to get interface data of flight mission resources.
* @param receiver
--
Gitblit v1.9.3