From ba967da3b2d0d2f277113602e1d67ef848b7bb9a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 25 Nov 2025 14:33:52 +0800
Subject: [PATCH] 2025-11-25 zwy 增加rth_mode字段，默认为1；实体和DTO中增加@JsonInclude(JsonInclude.Include.NON_NULL)序列化时忽略所有 null 字段
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 6079c7b..a2f6126 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
@@ -112,7 +112,7 @@
.bizCode(BizCodeEnum.FLIGHT_TASK_PROGRESS.getCode())
.build());
- if (receiver.getNeedReply() == 1) {
+ if (receiver.getNeedReply()!=null &&receiver.getNeedReply() == 1) {
messageSender.publish(receivedTopic + TopicConst._REPLY_SUF,
CommonTopicResponse.builder()
.tid(receiver.getTid())
@@ -124,6 +124,16 @@
}
}
+ /**
+ * 定时检查并处理航线定时任务
+ * <p>
+ * 该方法每5秒执行一次，从Redis有序集合中获取最早需要执行的任务，检查其执行时间：
+ * 1. 若任务已过期（超过当前时间30秒），则标记为失败并删除
+ * 2. 若任务在允许的时间窗口内（当前时间±30秒），则执行任务并删除
+ * </p>
+ *
+ * <p>任务ID格式：{workspace_id}:{dock_sn}:{job_id}</p>
+ */
@Scheduled(initialDelay = 10, fixedRate = 5, timeUnit = TimeUnit.SECONDS)
private void checkScheduledJob() {
Object jobIdValue = RedisOpsUtils.zGetMin(RedisConst.WAYLINE_JOB_TIMED_EXECUTE);
--
Gitblit v1.9.3