Skip to content

G
guns-vip
Commit 2a3046a5 by naan1993
Options

Merge branch 'dev'

parents 17324ac7 5874e4c9
Showing with 40 additions and 56 deletions
pom.xml
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<druid.version>1.0.28</druid.version> <druid.version>1.0.28</druid.version>
<beetl.version>2.7.15</beetl.version> <beetl.version>2.7.15</beetl.version>
<swagger.version>2.2.2</swagger.version> <swagger.version>2.2.2</swagger.version>
<commons-lang3.version>3.6</commons-lang3.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -174,6 +175,11 @@ ...@@ -174,6 +175,11 @@
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version> <version>${swagger.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
</dependencies> </dependencies>
......
src/main/java/com/stylefeng/guns/core/util/DateUtil.java
...@@ -22,18 +22,11 @@ import java.text.SimpleDateFormat; ...@@ -22,18 +22,11 @@ import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
public class DateUtil { import org.apache.commons.lang3.StringUtils;
private final static SimpleDateFormat sdfYear = new SimpleDateFormat("yyyy"); import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
private final static SimpleDateFormat sdfDay = new SimpleDateFormat("yyyy-MM-dd");
private final static SimpleDateFormat sdfDays = new SimpleDateFormat("yyyyMMdd");
private final static SimpleDateFormat sdfTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
private final static SimpleDateFormat sdfmsTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); public class DateUtil {
private final static SimpleDateFormat allTime = new SimpleDateFormat("yyyyMMddHHmmss");
/** /**
...@@ -42,7 +35,7 @@ public class DateUtil { ...@@ -42,7 +35,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String getYear() { public static String getYear() {
return sdfYear.format(new Date()); return formatDate(new Date(), "yyyy");
} }
/** /**
...@@ -51,7 +44,7 @@ public class DateUtil { ...@@ -51,7 +44,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String getYear(Date date) { public static String getYear(Date date) {
return sdfYear.format(date); return formatDate(date, "yyyy");
} }
/** /**
...@@ -60,7 +53,7 @@ public class DateUtil { ...@@ -60,7 +53,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String getDay() { public static String getDay() {
return sdfDay.format(new Date()); return formatDate(new Date(), "yyyy-MM-dd");
} }
/** /**
...@@ -69,7 +62,7 @@ public class DateUtil { ...@@ -69,7 +62,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String getDay(Date date) { public static String getDay(Date date) {
return sdfDay.format(date); return formatDate(date, "yyyy-MM-dd");
} }
/** /**
...@@ -78,7 +71,7 @@ public class DateUtil { ...@@ -78,7 +71,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String getDays() { public static String getDays() {
return sdfDays.format(new Date()); return formatDate(new Date(), "yyyyMMdd");
} }
/** /**
...@@ -87,7 +80,7 @@ public class DateUtil { ...@@ -87,7 +80,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String getDays(Date date) { public static String getDays(Date date) {
return sdfDays.format(date); return formatDate(date, "yyyyMMdd");
} }
/** /**
...@@ -96,7 +89,7 @@ public class DateUtil { ...@@ -96,7 +89,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String getTime() { public static String getTime() {
return sdfTime.format(new Date()); return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
} }
/** /**
...@@ -105,7 +98,7 @@ public class DateUtil { ...@@ -105,7 +98,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String getMsTime() { public static String getMsTime() {
return sdfmsTime.format(new Date()); return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
} }
/** /**
...@@ -114,7 +107,7 @@ public class DateUtil { ...@@ -114,7 +107,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String getAllTime() { public static String getAllTime() {
return allTime.format(new Date()); return formatDate(new Date(), "yyyyMMddHHmmss");
} }
/** /**
...@@ -123,7 +116,17 @@ public class DateUtil { ...@@ -123,7 +116,17 @@ public class DateUtil {
* @return * @return
*/ */
public static String getTime(Date date) { public static String getTime(Date date) {
return sdfTime.format(date); return formatDate(date, "yyyy-MM-dd HH:mm:ss");
}
public static String formatDate(Date date, String pattern) {
String formatDate = null;
if (StringUtils.isNotBlank(pattern)) {
formatDate = DateFormatUtils.format(date, pattern);
} else {
formatDate = DateFormatUtils.format(date, "yyyy-MM-dd");
}
return formatDate;
} }
/** /**
...@@ -148,12 +151,7 @@ public class DateUtil { ...@@ -148,12 +151,7 @@ public class DateUtil {
* @return * @return
*/ */
public static Date parseDate(String date) { public static Date parseDate(String date) {
try { return parse(date,"yyyy-MM-dd");
return sdfDay.parse(date);
} catch (ParseException e) {
e.printStackTrace();
return null;
}
} }
/** /**
...@@ -162,12 +160,7 @@ public class DateUtil { ...@@ -162,12 +160,7 @@ public class DateUtil {
* @return * @return
*/ */
public static Date parseTime(String date) { public static Date parseTime(String date) {
try { return parse(date,"yyyy-MM-dd HH:mm:ss");
return sdfTime.parse(date);
} catch (ParseException e) {
e.printStackTrace();
return null;
}
} }
/** /**
...@@ -176,9 +169,8 @@ public class DateUtil { ...@@ -176,9 +169,8 @@ public class DateUtil {
* @return * @return
*/ */
public static Date parse(String date, String pattern) { public static Date parse(String date, String pattern) {
DateFormat fmt = new SimpleDateFormat(pattern);
try { try {
return fmt.parse(date); return DateUtils.parseDate(date,pattern);
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
...@@ -191,8 +183,7 @@ public class DateUtil { ...@@ -191,8 +183,7 @@ public class DateUtil {
* @return * @return
*/ */
public static String format(Date date, String pattern) { public static String format(Date date, String pattern) {
DateFormat fmt = new SimpleDateFormat(pattern); return DateFormatUtils.format(date, pattern);
return fmt.format(date);
} }
/** /**
...@@ -202,7 +193,7 @@ public class DateUtil { ...@@ -202,7 +193,7 @@ public class DateUtil {
* @return * @return
*/ */
public static Timestamp format(Date date) { public static Timestamp format(Date date) {
return new java.sql.Timestamp(date.getTime()); return new Timestamp(date.getTime());
} }
/** /**
...@@ -211,13 +202,7 @@ public class DateUtil { ...@@ -211,13 +202,7 @@ public class DateUtil {
* @return * @return
*/ */
public static boolean isValidDate(String s) { public static boolean isValidDate(String s) {
try { return parse(s, "yyyy-MM-dd HH:mm:ss") != null;
sdfTime.parse(s);
return true;
} catch (Exception e) {
// 如果throw java.text.ParseException或者NullPointerException，就说明格式不对
return false;
}
} }
/** /**
...@@ -226,14 +211,7 @@ public class DateUtil { ...@@ -226,14 +211,7 @@ public class DateUtil {
* @return * @return
*/ */
public static boolean isValidDate(String s, String pattern) { public static boolean isValidDate(String s, String pattern) {
DateFormat fmt = new SimpleDateFormat(pattern); return parse(s, pattern) != null;
try {
fmt.parse(s);
return true;
} catch (Exception e) {
// 如果throw java.text.ParseException或者NullPointerException，就说明格式不对
return false;
}
} }
public static int getDiffYear(String startTime, String endTime) { public static int getDiffYear(String startTime, String endTime) {
...@@ -258,10 +236,10 @@ public class DateUtil { ...@@ -258,10 +236,10 @@ public class DateUtil {
*/ */
public static long getDaySub(String beginDateStr, String endDateStr) { public static long getDaySub(String beginDateStr, String endDateStr) {
long day = 0; long day = 0;
java.text.SimpleDateFormat format = new java.text.SimpleDateFormat( SimpleDateFormat format = new SimpleDateFormat(
"yyyy-MM-dd"); "yyyy-MM-dd");
java.util.Date beginDate = null; Date beginDate = null;
java.util.Date endDate = null; Date endDate = null;
try { try {
beginDate = format.parse(beginDateStr); beginDate = format.parse(beginDateStr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment