|
@@ -18,11 +18,10 @@ import org.springframework.security.config.web.servlet.headers.HttpPublicKeyPinn
|
|
|
|
|
|
/**
|
|
/**
|
|
* 时间工具类
|
|
* 时间工具类
|
|
- *
|
|
|
|
|
|
+ *
|
|
* @author ruoyi
|
|
* @author ruoyi
|
|
*/
|
|
*/
|
|
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
|
|
-{
|
|
|
|
|
|
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
|
|
public static String YYYY = "yyyy";
|
|
public static String YYYY = "yyyy";
|
|
|
|
|
|
public static String YYYY_MM = "yyyy-MM";
|
|
public static String YYYY_MM = "yyyy-MM";
|
|
@@ -36,63 +35,52 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
|
|
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
|
|
|
|
|
|
private static String[] parsePatterns = {
|
|
private static String[] parsePatterns = {
|
|
- "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
|
|
|
|
|
|
+ "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
|
|
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
|
|
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
|
|
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
|
|
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取当前Date型日期
|
|
* 获取当前Date型日期
|
|
- *
|
|
|
|
|
|
+ *
|
|
* @return Date() 当前日期
|
|
* @return Date() 当前日期
|
|
*/
|
|
*/
|
|
- public static Date getNowDate()
|
|
|
|
- {
|
|
|
|
|
|
+ public static Date getNowDate() {
|
|
return new Date();
|
|
return new Date();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取当前日期, 默认格式为yyyy-MM-dd
|
|
* 获取当前日期, 默认格式为yyyy-MM-dd
|
|
- *
|
|
|
|
|
|
+ *
|
|
* @return String
|
|
* @return String
|
|
*/
|
|
*/
|
|
- public static String getDate()
|
|
|
|
- {
|
|
|
|
|
|
+ public static String getDate() {
|
|
return dateTimeNow(YYYY_MM_DD);
|
|
return dateTimeNow(YYYY_MM_DD);
|
|
}
|
|
}
|
|
|
|
|
|
- public static final String getTime()
|
|
|
|
- {
|
|
|
|
|
|
+ public static final String getTime() {
|
|
return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
|
|
return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
|
|
}
|
|
}
|
|
|
|
|
|
- public static final String dateTimeNow()
|
|
|
|
- {
|
|
|
|
|
|
+ public static final String dateTimeNow() {
|
|
return dateTimeNow(YYYYMMDDHHMMSS);
|
|
return dateTimeNow(YYYYMMDDHHMMSS);
|
|
}
|
|
}
|
|
|
|
|
|
- public static final String dateTimeNow(final String format)
|
|
|
|
- {
|
|
|
|
|
|
+ public static final String dateTimeNow(final String format) {
|
|
return parseDateToStr(format, new Date());
|
|
return parseDateToStr(format, new Date());
|
|
}
|
|
}
|
|
|
|
|
|
- public static final String dateTime(final Date date)
|
|
|
|
- {
|
|
|
|
|
|
+ public static final String dateTime(final Date date) {
|
|
return parseDateToStr(YYYY_MM_DD, date);
|
|
return parseDateToStr(YYYY_MM_DD, date);
|
|
}
|
|
}
|
|
|
|
|
|
- public static final String parseDateToStr(final String format, final Date date)
|
|
|
|
- {
|
|
|
|
|
|
+ public static final String parseDateToStr(final String format, final Date date) {
|
|
return new SimpleDateFormat(format).format(date);
|
|
return new SimpleDateFormat(format).format(date);
|
|
}
|
|
}
|
|
|
|
|
|
- public static final Date dateTime(final String format, final String ts)
|
|
|
|
- {
|
|
|
|
- try
|
|
|
|
- {
|
|
|
|
|
|
+ public static final Date dateTime(final String format, final String ts) {
|
|
|
|
+ try {
|
|
return new SimpleDateFormat(format).parse(ts);
|
|
return new SimpleDateFormat(format).parse(ts);
|
|
- }
|
|
|
|
- catch (ParseException e)
|
|
|
|
- {
|
|
|
|
|
|
+ } catch (ParseException e) {
|
|
throw new RuntimeException(e);
|
|
throw new RuntimeException(e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -100,8 +88,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
/**
|
|
/**
|
|
* 日期路径 即年/月/日 如2018/08/08
|
|
* 日期路径 即年/月/日 如2018/08/08
|
|
*/
|
|
*/
|
|
- public static final String datePath()
|
|
|
|
- {
|
|
|
|
|
|
+ public static final String datePath() {
|
|
Date now = new Date();
|
|
Date now = new Date();
|
|
return DateFormatUtils.format(now, "yyyy/MM/dd");
|
|
return DateFormatUtils.format(now, "yyyy/MM/dd");
|
|
}
|
|
}
|
|
@@ -109,8 +96,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
/**
|
|
/**
|
|
* 日期路径 即年/月/日 如20180808
|
|
* 日期路径 即年/月/日 如20180808
|
|
*/
|
|
*/
|
|
- public static final String dateTime()
|
|
|
|
- {
|
|
|
|
|
|
+ public static final String dateTime() {
|
|
Date now = new Date();
|
|
Date now = new Date();
|
|
return DateFormatUtils.format(now, "yyyyMMdd");
|
|
return DateFormatUtils.format(now, "yyyyMMdd");
|
|
}
|
|
}
|
|
@@ -118,18 +104,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
/**
|
|
/**
|
|
* 日期型字符串转化为日期 格式
|
|
* 日期型字符串转化为日期 格式
|
|
*/
|
|
*/
|
|
- public static Date parseDate(Object str)
|
|
|
|
- {
|
|
|
|
- if (str == null)
|
|
|
|
- {
|
|
|
|
|
|
+ public static Date parseDate(Object str) {
|
|
|
|
+ if (str == null) {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
- try
|
|
|
|
- {
|
|
|
|
|
|
+ try {
|
|
return parseDate(str.toString(), parsePatterns);
|
|
return parseDate(str.toString(), parsePatterns);
|
|
- }
|
|
|
|
- catch (ParseException e)
|
|
|
|
- {
|
|
|
|
|
|
+ } catch (ParseException e) {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -137,8 +118,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
/**
|
|
/**
|
|
* 获取服务器启动时间
|
|
* 获取服务器启动时间
|
|
*/
|
|
*/
|
|
- public static Date getServerStartDate()
|
|
|
|
- {
|
|
|
|
|
|
+ public static Date getServerStartDate() {
|
|
long time = ManagementFactory.getRuntimeMXBean().getStartTime();
|
|
long time = ManagementFactory.getRuntimeMXBean().getStartTime();
|
|
return new Date(time);
|
|
return new Date(time);
|
|
}
|
|
}
|
|
@@ -146,16 +126,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
/**
|
|
/**
|
|
* 计算相差天数
|
|
* 计算相差天数
|
|
*/
|
|
*/
|
|
- public static int differentDaysByMillisecond(Date date1, Date date2)
|
|
|
|
- {
|
|
|
|
|
|
+ public static int differentDaysByMillisecond(Date date1, Date date2) {
|
|
return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
|
|
return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* 计算两个时间差
|
|
* 计算两个时间差
|
|
*/
|
|
*/
|
|
- public static String getDatePoor(Date endDate, Date nowDate)
|
|
|
|
- {
|
|
|
|
|
|
+ public static String getDatePoor(Date endDate, Date nowDate) {
|
|
long nd = 1000 * 24 * 60 * 60;
|
|
long nd = 1000 * 24 * 60 * 60;
|
|
long nh = 1000 * 60 * 60;
|
|
long nh = 1000 * 60 * 60;
|
|
long nm = 1000 * 60;
|
|
long nm = 1000 * 60;
|
|
@@ -176,8 +154,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
/**
|
|
/**
|
|
* 增加 LocalDateTime ==> Date
|
|
* 增加 LocalDateTime ==> Date
|
|
*/
|
|
*/
|
|
- public static Date toDate(LocalDateTime temporalAccessor)
|
|
|
|
- {
|
|
|
|
|
|
+ public static Date toDate(LocalDateTime temporalAccessor) {
|
|
ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
|
|
ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
|
|
return Date.from(zdt.toInstant());
|
|
return Date.from(zdt.toInstant());
|
|
}
|
|
}
|
|
@@ -185,8 +162,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
/**
|
|
/**
|
|
* 增加 LocalDate ==> Date
|
|
* 增加 LocalDate ==> Date
|
|
*/
|
|
*/
|
|
- public static Date toDate(LocalDate temporalAccessor)
|
|
|
|
- {
|
|
|
|
|
|
+ public static Date toDate(LocalDate temporalAccessor) {
|
|
LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
|
|
LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
|
|
ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
|
|
ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
|
|
return Date.from(zdt.toInstant());
|
|
return Date.from(zdt.toInstant());
|
|
@@ -195,78 +171,71 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
|
|
|
|
/**
|
|
/**
|
|
* 时间字符串转long类型
|
|
* 时间字符串转long类型
|
|
- * 2022-05-01 ===>>>> 20220501
|
|
|
|
|
|
+ * 2022-05-01 ===>>>> 20220501
|
|
|
|
+ *
|
|
* @param date
|
|
* @param date
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public static Long strDateToInt(String date){
|
|
|
|
|
|
+ public static Long strDateToInt(String date) {
|
|
|
|
|
|
- return Long.valueOf(date.replaceAll("-",""));
|
|
|
|
|
|
+ return Long.valueOf(date.replaceAll("-", ""));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
- *
|
|
|
|
- * @description: 获取当前周的开始和截至时间
|
|
|
|
* @param
|
|
* @param
|
|
|
|
+ * @description: 获取当前周的开始和截至时间
|
|
* @return: java.util.Map
|
|
* @return: java.util.Map
|
|
* @author: zianY
|
|
* @author: zianY
|
|
* @time: 2022/6/1
|
|
* @time: 2022/6/1
|
|
*/
|
|
*/
|
|
- public static Map getWeekBeginAndEnd(){
|
|
|
|
- Map<String,String> timeMap = new HashMap<>();
|
|
|
|
- String begin = parseDateToStr(YYYY_MM_DD,getBeginDayOfWeek());
|
|
|
|
- String end = parseDateToStr(YYYY_MM_DD,getEendDayOfWeek());
|
|
|
|
- timeMap.put("begin",begin+" 00:00:00");
|
|
|
|
- timeMap.put("end",end+" 23:59:59");
|
|
|
|
|
|
+ public static Map getWeekBeginAndEnd() {
|
|
|
|
+ Map<String, String> timeMap = new HashMap<>();
|
|
|
|
+ String begin = parseDateToStr(YYYY_MM_DD, getBeginDayOfWeek());
|
|
|
|
+ String end = parseDateToStr(YYYY_MM_DD, getEendDayOfWeek());
|
|
|
|
+ timeMap.put("begin", begin + " 00:00:00");
|
|
|
|
+ timeMap.put("end", end + " 23:59:59");
|
|
return timeMap;
|
|
return timeMap;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
- *
|
|
|
|
- * @description: 获取本周开始时间
|
|
|
|
- *
|
|
|
|
* @param
|
|
* @param
|
|
|
|
+ * @description: 获取本周开始时间
|
|
* @return: java.util.Date
|
|
* @return: java.util.Date
|
|
* @author: zianY
|
|
* @author: zianY
|
|
* @time: 2022/6/1
|
|
* @time: 2022/6/1
|
|
*/
|
|
*/
|
|
- public static Date getBeginDayOfWeek(){
|
|
|
|
|
|
+ public static Date getBeginDayOfWeek() {
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
Calendar cal = Calendar.getInstance();
|
|
Calendar cal = Calendar.getInstance();
|
|
cal.setTime(date);
|
|
cal.setTime(date);
|
|
int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
|
|
int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
|
|
- if (dayOfWeek == 1){
|
|
|
|
- dayOfWeek +=7;
|
|
|
|
|
|
+ if (dayOfWeek == 1) {
|
|
|
|
+ dayOfWeek += 7;
|
|
}
|
|
}
|
|
- cal.add(Calendar.DATE,2-dayOfWeek);
|
|
|
|
|
|
+ cal.add(Calendar.DATE, 2 - dayOfWeek);
|
|
return cal.getTime();
|
|
return cal.getTime();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- *
|
|
|
|
- * @description: 获取本周结束时间
|
|
|
|
- *
|
|
|
|
* @param
|
|
* @param
|
|
|
|
+ * @description: 获取本周结束时间
|
|
* @return: java.util.Date
|
|
* @return: java.util.Date
|
|
* @author: zianY
|
|
* @author: zianY
|
|
* @time: 2022/6/1
|
|
* @time: 2022/6/1
|
|
*/
|
|
*/
|
|
- public static Date getEendDayOfWeek(){
|
|
|
|
|
|
+ public static Date getEendDayOfWeek() {
|
|
|
|
|
|
Calendar cal = Calendar.getInstance();
|
|
Calendar cal = Calendar.getInstance();
|
|
cal.setTime(getBeginDayOfWeek());
|
|
cal.setTime(getBeginDayOfWeek());
|
|
- cal.add(Calendar.DAY_OF_WEEK,6);
|
|
|
|
|
|
+ cal.add(Calendar.DAY_OF_WEEK, 6);
|
|
return cal.getTime();
|
|
return cal.getTime();
|
|
}
|
|
}
|
|
|
|
|
|
public static void main(String[] args) {
|
|
public static void main(String[] args) {
|
|
//System.out.println(parseDateToStr(YYYY_MM_DD,getBeginDayOfWeek()));
|
|
//System.out.println(parseDateToStr(YYYY_MM_DD,getBeginDayOfWeek()));
|
|
- // System.out.println(parseDateToStr(YYYY_MM_DD,getEendDayOfWeek()));
|
|
|
|
|
|
+ // System.out.println(parseDateToStr(YYYY_MM_DD,getEendDayOfWeek()));
|
|
|
|
|
|
System.out.println(strDateToInt("2022-05"));
|
|
System.out.println(strDateToInt("2022-05"));
|
|
}
|
|
}
|
|
@@ -285,4 +254,22 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
return getSDFormat(pattern).format(date);
|
|
return getSDFormat(pattern).format(date);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 日期转换为时间戳
|
|
|
|
+ */
|
|
|
|
+ public static long timeToStamp(String timers) {
|
|
|
|
+ Date d = new Date();
|
|
|
|
+ long timeStemp = 0;
|
|
|
|
+ try {
|
|
|
|
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
+ // 日期转换为时间戳
|
|
|
|
+ d = sf.parse(timers);
|
|
|
|
+ } catch (ParseException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ timeStemp = d.getTime();
|
|
|
|
+ return timeStemp;
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|