From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
index bc95595..dab4e40 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
@@ -86,11 +86,41 @@
date = sdf.parse(st);
return date.getTime();
} catch (Exception e) {
- // e.printStackTrace();
+ e.printStackTrace();
return 0;
}
}
-
+
+ public static Date parseYYYYMM(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseYYYYMMDD_HHMMSS(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseYYYYMMDD(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
public static long convertAllTimeToTemp(String st) {
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -103,6 +133,12 @@
return 0;
}
+ public static String formatDate(long time) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ String date = sdf.format(new Date(time));
+ return date;
+ }
+
public static String formatDate(Date time) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
String date = sdf.format(time);
@@ -113,6 +149,16 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
String date = sdf.format(time);
return date;
+ }
+
+ public static String formatDateAddT(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+ try {
+ return sdf.format(date);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
}
public static long convertToTimeTemp(String st, String format) {
@@ -138,6 +184,7 @@
}
return 0;
}
+
public static long convertDateToTemp2(String st) {
Date date = new Date();
--
Gitblit v1.8.0