From 5b1fb0ef7416092cda516c0bf4113dc94287e7cb Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Tue, 18 Nov 2025 16:53:26 +0800
Subject: [PATCH] 1.增加上传航线到边缘服务器接口。 2.增加开始航线接口。 3.增加暂停航线接口。 4.增加恢复航线接口。 5.增加结束航线接口。 6.注释修改。
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 da2cf17..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.
@@ -580,8 +582,8 @@
new Page<WaylineJobEntity>(page, pageSize),
new LambdaQueryWrapper<WaylineJobEntity>()
// 实际开始时间筛选，允许为空，为空则不进行筛选
- .ge(startTime != null, WaylineJobEntity::getExecuteTime, startTime)
- .le(endTime != null, WaylineJobEntity::getExecuteTime, endTime)
+ .ge(startTime != null, WaylineJobEntity::getBeginTime, startTime)
+ .le(endTime != null, WaylineJobEntity::getBeginTime, endTime)
// 任务类型筛选，允许为空，为空则不进行筛选
.eq(taskType != null, WaylineJobEntity::getTaskType, taskType)
// 任务名称筛选，允许为空，为空则不进行筛选;....模糊查询
--
Gitblit v1.9.3