From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
index 65c71f5..71ea2c8 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
@@ -6,6 +6,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
+import java.util.Calendar;
import java.util.Date;
/**
@@ -167,6 +168,20 @@
return day + "天" + hour + "小时" + min + "分钟";
}
+ public static long diffTime(Date startTime, Date endTime){
+ // 获取Calendar实例
+ Calendar cal1 = Calendar.getInstance();
+ Calendar cal2 = Calendar.getInstance();
+ // 设置Calendar对象的时间
+ cal1.setTime(startTime);
+ cal2.setTime(endTime);
+ // 获取时间差
+ long milliseconds1 = cal1.getTimeInMillis();
+ long milliseconds2 = cal2.getTimeInMillis();
+ long diff = milliseconds2 - milliseconds1;
+ return diff;
+ }
+
/**
* 增加 LocalDateTime ==> Date
*/
@@ -207,4 +222,15 @@
}
return sb.toString();
}
+
+ public static Date getTodayStartTime() {
+ // 获取今天的日期
+ LocalDate today = LocalDate.now();
+
+ // 获取当天的开始时间（00:00:00）
+ LocalDateTime startOfDay = today.atStartOfDay();
+
+ // 转换为 Date 类型
+ return Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+ }
}
--
Gitblit v1.7.1