From 86e7cce6159d6d74bcc636327939ec9ea8d3009d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 21 二月 2025 14:15:21 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 801c238..f4f271c 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -48,6 +48,7 @@
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 瀹氭椂浠诲姟璋冨害娴嬭瘯
@@ -308,7 +309,11 @@
                 ServiceSubtaskVO ivrTaskcall = new ServiceSubtaskVO();
                 ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
                 ivrTaskcall.setSendstate(2L);
-                List<ServiceSubtask> selectServiceSubtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
+                List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
+
+                // 鎸夌収 endtime 绂诲綋鍓嶆椂闂存渶杩戠殑鎺掑簭
+                List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream().sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime()))).collect(Collectors.toList());
+
                 if (descByCode.equals("鐢佃瘽")) {
                     String value = "";
                     List<String> list = new ArrayList<>();
@@ -343,8 +348,10 @@
                         }
                     }
                     //灏嗚鎵ц鐨勬斁鍒扮紦瀛樹腑
-                    redisCache.setCacheList("cache-0", list);
-
+                    if (list.size() > 0) {
+//                        redisCache.setCacheListLeft("cache-0", list);
+                        redisCache.setCacheListLeftAndDistinct("cache-0", list);
+                    }
                 } else if (descByCode.equals("澶氬獟浣�")) {
                     //澶氬獟浣�
                 } else if (descByCode.equals("绾歌川")) {

--
Gitblit v1.9.3