From c3e1f9b9af29647bd157f2ea268bc56b2d3b9df1 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 31 Aug 2020 14:47:46 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/common/convert/StringToDateConverter.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/moral/common/convert/StringToDateConverter.java b/src/main/java/com/moral/common/convert/StringToDateConverter.java
index e016349..e999880 100644
--- a/src/main/java/com/moral/common/convert/StringToDateConverter.java
+++ b/src/main/java/com/moral/common/convert/StringToDateConverter.java
@@ -9,34 +9,36 @@
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> {
- Logger log = Logger.getLogger(StringToDateConverter.class);
+ 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)
*/
@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)){
+ 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