From 8ea24dd5fb6e1b24d3a7ef62a0060ef516f8f759 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 24 May 2018 08:58:16 +0800
Subject: [PATCH] 更新 监测点 数据
---
src/main/java/com/moral/common/convert/StringToDateConverter.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/common/convert/StringToDateConverter.java b/src/main/java/com/moral/common/convert/StringToDateConverter.java
index d08bc68..e016349 100644
--- a/src/main/java/com/moral/common/convert/StringToDateConverter.java
+++ b/src/main/java/com/moral/common/convert/StringToDateConverter.java
@@ -1,8 +1,11 @@
package com.moral.common.convert;
+import com.moral.common.exception.BusinessException;
import com.moral.common.util.StringUtils;
+import org.apache.log4j.Logger;
import org.springframework.core.convert.converter.Converter;
-
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
/**
@@ -11,18 +14,31 @@
* @version $Id: StringToDateConverter.java, v 0.1 2015���9���24��� ������7:19:41 byshome Exp $
*/
public class StringToDateConverter implements Converter<String, Date> {
-// private static final String dateFormat = "yyyy-MM-dd HH:mm:ss";
+ 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);
/**
* @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
*/
@Override
public Date convert(String source) {
if(StringUtils.isNullOrEmpty(source)){
- throw new RuntimeException(String.format("parser %s to Date fail", source));
- };
- return new Date(Long.parseLong(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);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ log.error(e.getMessage());
+ }
+ return null;
}
}
\ No newline at end of file
--
Gitblit v1.8.0