From 4bf0125f2cbc291b763a3c0a83629a470189a771 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jul 2019 16:34:18 +0800
Subject: [PATCH] 更新重合点逻辑及多点重合显示方式
---
src/main/java/com/moral/common/convert/StringToDateConverter.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 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..e999880 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)
*/
@@ -25,9 +25,6 @@
public Date convert(String source) {
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)) {
@@ -43,7 +40,6 @@
e.printStackTrace();
log.error(e.getMessage());
}
-
return null;
}
--
Gitblit v1.8.0