From 4cd6c6c06d16b1e80600b6e7e812152444ed3e48 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 16 Dec 2025 15:51:10 +0800
Subject: [PATCH] 2025-12-16 zwy 优化-删除任务时，正在执行中的任务不能删除
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 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 35fa501..3f7a629 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
@@ -140,16 +140,16 @@
.build());
}
// 进度
- if (eventsReceiver.getOutput().getProgress().getPercent() >= 95) {
- return;
- }
+// if (eventsReceiver.getOutput().getProgress().getPercent() >= 95) {
+// return;
+// }
String json = "";
try {
json = mapper.writeValueAsString(eventsReceiver);
} catch (Exception e) {
e.printStackTrace();
}
- _dockWebSocketHandler.sendMessageToSubscribers(dockSn, MessageType.STATUS.getType(), json);
+ _dockWebSocketHandler.sendMessageToSubscribers(dockSn, MessageType.STATUS.getType(), json, "");
}
/**
@@ -172,30 +172,34 @@
// 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;
--
Gitblit v1.9.3