From 8849a8a7032079df128f0c530fd4368cfbc75d81 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:10:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-common/src/main/java/com/oying/utils/DateUtil.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/oying-common/src/main/java/com/oying/utils/DateUtil.java b/oying-common/src/main/java/com/oying/utils/DateUtil.java
index 1ab0205..b95aeed 100644
--- a/oying-common/src/main/java/com/oying/utils/DateUtil.java
+++ b/oying-common/src/main/java/com/oying/utils/DateUtil.java
@@ -15,17 +15,39 @@
public static final DateTimeFormatter DFY_MD_HMS = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
public static final DateTimeFormatter DFY_MD = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ public static final DateTimeFormatter DFY_M = DateTimeFormatter.ofPattern("yyyy-MM");
public static final DateTimeFormatter SDF_YMDHMS = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+ public static boolean isBefore(String date, int count) {
+ LocalDateTime time = LocalDateTime.parse(date, SDF_YMDHMS);
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime nowPlus30 = time.plusDays(count);
+
+ // 检查目标时间是否在 [time, time+count天] 区间内
+ return !now.isBefore(time) && !now.isAfter(nowPlus30);
+ }
+
/**
- * Timestamp增加分钟
+ * Timestamp增减天
*/
- public static Timestamp addMinute(Timestamp time, int month) {
+ public static Timestamp addDay(Timestamp time, int count) {
// 创建 Calendar 对象并设置为当前日期和时间的值
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(time.getTime());
// 将MINUTE字段添加到当前日期和时间
- calendar.add(Calendar.MINUTE, month);
+ calendar.add(Calendar.DATE, count);
+ return new Timestamp(calendar.getTime().getTime());
+ }
+
+ /**
+ * Timestamp增减分钟
+ */
+ public static Timestamp addMinute(Timestamp time, int count) {
+ // 创建 Calendar 对象并设置为当前日期和时间的值
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(time.getTime());
+ // 将MINUTE字段添加到当前日期和时间
+ calendar.add(Calendar.MINUTE, count);
return new Timestamp(calendar.getTime().getTime());
}
@@ -126,6 +148,24 @@
}
/**
+ * 获取当前时间yyyyMMdd
+ *
+ * @return 、yyyyMMdd
+ */
+ public static String getNowTimeTypeYYYYMMDD() {
+ return DFY_MD.format(LocalDateTime.now());
+ }
+
+ /**
+ * 获取当前时间yyyyMM
+ *
+ * @return 、yyyyMM
+ */
+ public static String getNowTimeTypeYYYYMM() {
+ return DFY_M.format(LocalDateTime.now());
+ }
+
+ /**
* 日期格式化 yyyy-MM-dd
*
* @param localDateTime /
--
Gitblit v1.9.3