From d2b4f1493696c28355242deda4eaa66ceb1ec7d6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 18 Nov 2025 15:18:07 +0800
Subject: [PATCH] 2025-11-15 zwy 取消任务时，任务状态无法取消返回提示改为中文。
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 12 +++++++-----
ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java | 7 ++++++-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java b/ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java
index 9ab23cb..d4f110b 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java
@@ -71,7 +71,12 @@
@ApiOperation("取消航线任务")
@DeleteMapping("/jobs")
public ResponseResult publishCancelJob(@RequestParam(name = "job_id") Set<String> jobIds){
- waylineJobService.cancelFlightTask(jobIds);
+ try{
+ waylineJobService.cancelFlightTask(jobIds);
+ }
+ catch (Exception e){
+ return ResponseResult.error(e.getMessage());
+ }
return ResponseResult.success();
}
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