From 4136ac9c1be3198bfe6c4d3726ee18cf05777df9 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 04 Dec 2025 17:11:36 +0800
Subject: [PATCH] 2025-12-04 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