From 38dac8f822d1ede5e9fd3fbe3e8a5de719fd6883 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 10 Dec 2025 09:17:25 +0800
Subject: [PATCH] 2025-12-10 zwy 在切换无人机摄像头时，因为无人机不支持红外，切换失败，修改提示内容为“325003000，指令响应失败，请确认无人机是否支持此功能。”
---
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