From 19fa90abbc2043b73bef3992428d912d011fc8c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 09:59:49 +0800
Subject: [PATCH] 合并代码
---
management/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/management/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java b/management/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
index 9dbcdab..21b4be2 100644
--- a/management/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
+++ b/management/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
@@ -295,6 +295,36 @@
}
/**
+ * 字符串日期转Date yyyy-MM-dd
+ * @param dateStr
+ * @return
+ */
+ public static Date getDate_str4(String dateStr) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ sdf.setTimeZone(tz);
+ if ("".equals(dateStr)) {
+ dateStr = sdf.format(DateUtil.getDate());
+ }
+ Date date = null;
+ try {
+ date = sdf.parse(dateStr);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return date;
+ }
+
+ /**
+ * 格式化Date yyyy-MM-dd HH:mm:ss
+ * @param date
+ * @return
+ */
+ public static String formatDate(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return sdf.format(date);
+ }
+
+ /**
* 获取当前毫秒数
* @return long
*/
--
Gitblit v1.7.1