From 59624aae15d09d3042d357f60613d844f42c6b1d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 16 Dec 2025 17:18:13 +0800
Subject: [PATCH] 2025-12-16 zwy 优化创建计划任务-定时任务时间提示错误码
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java
index 34da626..2d3e6a2 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java
@@ -149,7 +149,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- _dockWebSocketHandler.sendMessageToSubscribers(dockSn, MessageType.STATUS.getType(), json);
+ _dockWebSocketHandler.sendMessageToSubscribers(dockSn, MessageType.STATUS.getType(), json, "");
}
/**
@@ -168,40 +168,45 @@
if (Objects.isNull(jobIdValue)) {
return;
}
- log.info("Check the timed tasks of the wayline. {}", jobIdValue);
+ log.info("检查 wayline 的定时任务。 {}", jobIdValue);
// format: {workspace_id}:{dock_sn}:{job_id}
String[] jobArr = String.valueOf(jobIdValue).split(RedisConst.DELIMITER);
double time = RedisOpsUtils.zScore(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, jobIdValue);
- // 取到待执行的定时任务ID，获取任务信息websocket发给前端
// region 取定时任务信息websocket发给前端
- // pending status状态待执行
- EventsReceiver<WaylineTaskProgressReceiver> eventsReceiver = new EventsReceiver<>();
- WaylineTaskProgressReceiver waylineTaskProgressReceiver = new WaylineTaskProgressReceiver();
- WaylineTaskProgressExt waylineTaskProgressExt = new WaylineTaskProgressExt();
- waylineTaskProgressExt.setFlightId(jobArr[1]);
- waylineTaskProgressReceiver.setStatus("pending");
- waylineTaskProgressReceiver.setExt(waylineTaskProgressExt);
- eventsReceiver.setOutput(waylineTaskProgressReceiver);
- eventsReceiver.setResult(ResponseResult.CODE_SUCCESS);
- eventsReceiver.setBid(IdUtils.simpleUUID());
- eventsReceiver.setSn(jobArr[0]);
- eventsReceiver.setGateway(jobArr[0]);
- eventsReceiver.setType(MessageType.STATUS.getType() + "-flighttask_progress");
- eventsReceiver.setMethod(EventsMethodEnum.FLIGHT_TASK_PROGRESS.getMethod());
- String json = "";
- try {
- json = mapper.writeValueAsString(eventsReceiver);
- } catch (Exception e) {
- e.printStackTrace();
+ // 定时任务执行前，判断有没有任务正在执行，在执行则不发送websocket消息
+ String key = RedisConst.WAYLINE_JOB_RUNNING_PREFIX + jobArr[0];
+ if (!RedisOpsUtils.checkExist(key)) {
+ // 取到待执行的定时任务ID，获取任务信息websocket发给前端
+ // pending status状态待执行
+ EventsReceiver<WaylineTaskProgressReceiver> eventsReceiver = new EventsReceiver<>();
+ WaylineTaskProgressReceiver waylineTaskProgressReceiver = new WaylineTaskProgressReceiver();
+ WaylineTaskProgressExt waylineTaskProgressExt = new WaylineTaskProgressExt();
+ waylineTaskProgressExt.setFlightId(jobArr[1]);
+ waylineTaskProgressReceiver.setStatus("pending");
+ waylineTaskProgressReceiver.setExt(waylineTaskProgressExt);
+ eventsReceiver.setOutput(waylineTaskProgressReceiver);
+ eventsReceiver.setResult(ResponseResult.CODE_SUCCESS);
+ eventsReceiver.setBid(IdUtils.simpleUUID());
+ eventsReceiver.setSn(jobArr[0]);
+ eventsReceiver.setGateway(jobArr[0]);
+ eventsReceiver.setType(MessageType.STATUS.getType() + "-flighttask_progress");
+ eventsReceiver.setMethod(EventsMethodEnum.FLIGHT_TASK_PROGRESS.getMethod());
+ String json = "";
+ try {
+ json = mapper.writeValueAsString(eventsReceiver);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ _dockWebSocketHandler.sendMessageToSubscribers(jobArr[0], MessageType.STATUS.getType(), json, "");
+ log.info("定时任务自定义状态为待执行，json: {}", json);
}
- _dockWebSocketHandler.sendMessageToSubscribers(jobArr[0], MessageType.STATUS.getType(), json);
- log.info("定时任务自定义状态为待执行，json: {}", json);
// endregion
long now = System.currentTimeMillis();
int offset = 30_000;
- // Expired tasks are deleted directly.
+ // 过期任务会直接删除。
if (time < now - offset) {
+ log.info("定时任务超时，jobId: {}", jobArr[1]);
RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, jobIdValue);
waylineJobService.updateJob(WaylineJobDTO.builder()
.jobId(jobArr[1])
@@ -214,11 +219,11 @@
if (now <= time && time <= now + offset) {
try {
- waylineJobService.executeFlightTask(jobArr[2]);
+ waylineJobService.executeFlightTask(jobArr[1]);
} catch (Exception e) {
- log.info("The scheduled task delivery failed.");
+ log.info("计划中的任务交付失败了。jobId: {}，异常信息：{}", jobArr[1], e.getMessage());
waylineJobService.updateJob(WaylineJobDTO.builder()
- .jobId(jobArr[2])
+ .jobId(jobArr[1])
.status(WaylineJobStatusEnum.FAILED.getVal())
.executeTime(LocalDateTime.now())
.completedTime(LocalDateTime.now())
--
Gitblit v1.9.3