From cfe049492f81d2c650a2b17348593edbc5054498 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 18 三月 2026 07:52:44 +0800
Subject: [PATCH] #3.5

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java
index 841efd0..908e44f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java
@@ -6,9 +6,11 @@
 import com.vincent.rsf.server.system.entity.AiDiagnosisPlan;
 import com.vincent.rsf.server.system.mapper.AiDiagnosisPlanMapper;
 import com.vincent.rsf.server.system.service.AiDiagnosisPlanService;
-import org.springframework.scheduling.support.CronSequenceGenerator;
+import org.springframework.scheduling.support.CronExpression;
 import org.springframework.stereotype.Service;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -42,7 +44,9 @@
         if (!validateCron(cronExpr)) {
             return null;
         }
-        return new CronSequenceGenerator(cronExpr.trim()).next(after == null ? new Date() : after);
+        ZonedDateTime next = CronExpression.parse(cronExpr.trim())
+                .next((after == null ? new Date() : after).toInstant().atZone(ZoneId.systemDefault()));
+        return next == null ? null : Date.from(next.toInstant());
     }
 
     @Override
@@ -50,7 +54,7 @@
         if (cronExpr == null || cronExpr.trim().isEmpty()) {
             return false;
         }
-        return CronSequenceGenerator.isValidExpression(cronExpr.trim());
+        return CronExpression.isValidExpression(cronExpr.trim());
     }
 
     @Override

--
Gitblit v1.9.1