From f5fe67e04309b041ec98a5e071cb227a7a1021ca Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 04 Dec 2025 16:29:46 +0800
Subject: [PATCH] 2025-12-04 zwy hms增加in_the_sky、device_type两个字段

---
 ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 930ca2e..2352c51 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
@@ -630,7 +630,7 @@
                     .status(WaylineJobStatusEnum.CANCEL.getVal())
                     .completedTime(LocalDateTime.now())
                     .build());
-            RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, RedisConst.DELIMITER + dockSn + RedisConst.DELIMITER + jobId);
+            RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, dockSn + RedisConst.DELIMITER + jobId);
             // 原流程是修改表中数据的status状态值,现在的精力是直接删除
             this.deleteTask(jobId);
         }
@@ -772,6 +772,18 @@
                 .orderByDesc(WaylineJobEntity::getId));
     }
 
+    /**
+     * 获取所有待定状态的定时任务,未执行即将要执行的。
+     * */
+    public List<WaylineJobEntity> selectScheduledTaskList(){
+        // "1":"定时任务"
+        return mapper.selectList(new LambdaQueryWrapper<WaylineJobEntity>()
+                .eq(WaylineJobEntity::getTaskType, 1)
+                .eq(WaylineJobEntity::getStatus, WaylineJobStatusEnum.PENDING.getVal())
+                .gt(WaylineJobEntity::getBeginTime, System.currentTimeMillis())
+                .orderByDesc(WaylineJobEntity::getBeginTime));
+    }
+
 
     /**
      * 根据航班任务ID获取航班任务资源

--
Gitblit v1.9.3