From fadbcd1f76ec12d760b059018b8a37aaa64303de Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Wed, 19 Nov 2025 10:18:58 +0800
Subject: [PATCH] 优化
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 0c5eb6f..5ad9c33 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
@@ -179,13 +179,14 @@
}
Optional<WaylineJobDTO> waylineJobOpt = this.createWaylineJob(param, loginUser.getUsername(),
param.getExecuteTime(), param.getExecuteTime());
- if (waylineJobOpt.isEmpty()) {
- return ResponseResult.error("创建机场任务失败！");
- }
// 循环任务
if (param.getTaskType() == WaylineTaskTypeEnum.LOOP.getVal()) {
// 循环任务，不立即执行，由定时任务发布
return ResponseResult.success();
+ }
+
+ if (waylineJobOpt.isEmpty()) {
+ return ResponseResult.error("创建机场任务失败！");
}
WaylineJobDTO waylineJob = waylineJobOpt.get();
@@ -439,8 +440,9 @@
// Check if the task status is correct.
boolean isErr = !jobIds.removeAll(waylineJobIds) || !jobIds.isEmpty();
if (isErr) {
- throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. "
- + Arrays.toString(jobIds.toArray()));
+ throw new IllegalArgumentException("任务开始后，无法取消。" + Arrays.toString(jobIds.toArray()));
+// throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. "
+// + Arrays.toString(jobIds.toArray()));
}
// Group job id by dock sn.
--
Gitblit v1.9.3