From 1bd6bae9ba8d8a2a01101992bbcae1643f244558 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 30 Jul 2018 11:25:11 +0800
Subject: [PATCH] 字符串转时间类型 优化
---
src/main/java/com/moral/common/convert/StringToDateConverter.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/common/convert/StringToDateConverter.java b/src/main/java/com/moral/common/convert/StringToDateConverter.java
index a564a25..0a4fb68 100644
--- a/src/main/java/com/moral/common/convert/StringToDateConverter.java
+++ b/src/main/java/com/moral/common/convert/StringToDateConverter.java
@@ -23,21 +23,27 @@
*/
@Override
public Date convert(String source) {
- if(StringUtils.isNullOrEmpty(source)){
- throw new BusinessException(String.format("parser %s to Date fail", source));
- }
- if("null".equals(source)){
- return null;
- }
- if(StringUtils.isNumericZidai(source)){
- return new Date(Long.parseLong(source));
- }
try {
- return simpleDateFormat.parse(source);
+ if(StringUtils.isNullOrEmpty(source)){
+ throw new BusinessException(String.format("parser %s to Date fail", source));
+ }
+ if("null".equals(source)){
+ return null;
+ }
+ if(StringUtils.isNumericZidai(source)) {
+ source = source.length() == 10 ? source+"000" : source;
+ return new Date(Long.parseLong(source));
+ } else {
+ return simpleDateFormat.parse(source);
+ }
} catch (ParseException e) {
e.printStackTrace();
log.error(e.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error(e.getMessage());
}
+
return null;
}
--
Gitblit v1.8.0