From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 3ff67fb..d777ac4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.utils;
import java.lang.management.ManagementFactory;
+import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -28,7 +29,7 @@
public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
- public static String YYYY_MM_DD_HH_MM_SS_MS = "yyyy-MM-dd HH:mm:ss.fff";
+ public static String YYYY_MM_DD_HH_MM_SS_MS = "yyyy-MM-dd HH:mm:ss.SSS";
public static String HH_MM_SS = "HH:mm:ss";
private static String[] parsePatterns = {
@@ -85,6 +86,21 @@
}
/**
+ * 杞崲Date鍘绘帀姣
+ */
+ public static final Date covertTime(Date date) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Timestamp now = new Timestamp(date.getTime());
+ String str = df.format(now);
+ Date newDate = null;
+ try {
+ newDate = df.parse(str);
+ } catch (ParseException e) {
+ throw new RuntimeException("杞崲鏃ユ湡鍘绘帀姣寮傚父");
+ }
+ return newDate;
+ }
+ /**
* 鏃ユ湡璺緞 鍗冲勾/鏈�/鏃� 濡�2018/08/08
*/
public static final String datePath() {
--
Gitblit v1.9.3