From 5ddef25bcb1f56a10eddf2a264cb338d178ff5f1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 05 Sep 2018 09:50:15 +0800
Subject: [PATCH] 百度地图，方案助手完善
---
src/main/java/com/moral/common/convert/StringToDateConverter.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/common/convert/StringToDateConverter.java b/src/main/java/com/moral/common/convert/StringToDateConverter.java
index 0a4fb68..0b16948 100644
--- a/src/main/java/com/moral/common/convert/StringToDateConverter.java
+++ b/src/main/java/com/moral/common/convert/StringToDateConverter.java
@@ -9,15 +9,15 @@
import java.util.Date;
/**
- * ������������������������������
- * @author byshome
- * @version $Id: StringToDateConverter.java, v 0.1 2015���9���24��� ������7:19:41 byshome Exp $
+ *
+ * ������������������������������:
+ * @author: fengxiang
+ * @date: 2018/7/30 14:40
*/
public class StringToDateConverter implements Converter<String, Date> {
private static Logger log = Logger.getLogger(StringToDateConverter.class);
private static final String dateFormat = "yyyy-MM-dd HH:mm:ss";
-// private static final String shortDateFormat = "yyyy-MM-dd";
- private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormat);
+ private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormat);
/**
* @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
*/
@@ -26,9 +26,6 @@
try {
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;
--
Gitblit v1.8.0