From 842c0049ea8498ea4adb3ca119157561b4d7df4f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 17:26:37 +0800
Subject: [PATCH] 2025-12-08 zwy 整理设备属性设置无人机不在线时返回前端错误提示代码为自定义代码，设备已离线和机场代码共用一个，无法区分机场和无人机设备。
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 2352c51..7862e01 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -597,8 +597,17 @@
return ResponseResult.error("任务不存在，jobId: " + jobId);
}
if (waylineJobDTO.get().getTaskType() == 3) {
- // 已经执行完的子任务是否删除，或者清掉父任务ID，和正常任务一起显示在列表中。
+ // 已经执行完的子任务一起全部删除
this.deleteTask(jobId);
+ log.info("删除循环任务已经完成，主任务ID：{}。", waylineJobDTO.get().getJobId());
+ List<WaylineJobDTO> waylineParentIds = this.getJobByJobParentId(jobId);
+ if (!waylineParentIds.isEmpty()) {
+ for (WaylineJobDTO waylineJob : waylineParentIds) {
+ this.deleteTask(waylineJob.getJobId());
+ RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, dockSn + RedisConst.DELIMITER + waylineJob.getJobId());
+ log.info("删除循环子任务已经完成，子任务ID：{}。", waylineJob.getJobId());
+ }
+ }
return ResponseResult.success();
}
}
--
Gitblit v1.9.3