ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2022-03-26 01:21:58 +08:00
parent 75f4ca356d
commit 48a99942d7
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
View File

@ -79,7 +79,6 @@ public class CronPattern {
}
// --------------------------------------------------------------------------------------- match start
/**
* 给定时间是否匹配定时任务表达式
*

48
hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/MatcherTable.java
View File

@ -1,5 +1,7 @@
package cn.hutool.cron.pattern.matcher;
import cn.hutool.core.collection.CollUtil;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@ -27,6 +29,52 @@ public class MatcherTable {
}
public LocalDateTime nextMatchAfter(int second, int minute, int hour, int dayOfMonth, int month, int dayOfWeek, int year) {
List<LocalDateTime> nextMatchs = new ArrayList<>(second);
for (DateTimeMatcher matcher : matchers) {
nextMatchs.add(singleNextMatchAfter(matcher, second, minute, hour,
dayOfMonth, month, dayOfWeek, year));
}
// 返回最先匹配到的日期
return CollUtil.min(nextMatchs);
}
private static LocalDateTime singleNextMatchAfter(DateTimeMatcher matcher, int second, int minute, int hour,
int dayOfMonth, int month, int dayOfWeek, int year){
boolean isNextNotEquals = true;
// 年
final int nextYear = matcher.yearMatcher.nextAfter(year);
isNextNotEquals &= (year != nextYear);
// 周
int nextDayOfWeek;
if(isNextNotEquals){
// 上一个字段不一致，说明产生了新值，本字段使用最小值
nextDayOfWeek = ((BoolArrayValueMatcher)matcher.dayOfWeekMatcher).getMinValue();
}else{
nextDayOfWeek = matcher.dayOfWeekMatcher.nextAfter(dayOfWeek);
isNextNotEquals &= (dayOfWeek != nextDayOfWeek);
}
// 月
int nextMonth;
if(isNextNotEquals){
// 上一个字段不一致，说明产生了新值，本字段使用最小值
nextMonth = ((BoolArrayValueMatcher)matcher.monthMatcher).getMinValue();
}else{
nextMonth = matcher.monthMatcher.nextAfter(dayOfWeek);
isNextNotEquals &= (month != nextMonth);
}
// 日
int nextDayOfMonth;
if(isNextNotEquals){
// 上一个字段不一致，说明产生了新值，本字段使用最小值
nextDayOfMonth = ((BoolArrayValueMatcher)matcher.dayOfMonthMatcher).getMinValue();
}else{
nextDayOfMonth = matcher.dayOfMonthMatcher.nextAfter(dayOfWeek);
isNextNotEquals &= (dayOfMonth != nextDayOfMonth);
}
return null;
}