From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java | 15 +++++++++++++++
1 files changed, 15 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..dee9fc5 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
*/
--
Gitblit v1.7.1