From d9b2c4b780340d2d2e8ca1a328034f19092fcddb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 10 七月 2019 17:57:08 +0800
Subject: [PATCH] 提交breadcrumb功能
---
java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java b/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java
index 257fe61..3097711 100644
--- a/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java
+++ b/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java
@@ -33,7 +33,12 @@
Date date1 = null;
if (value instanceof String) {
String date = (String) value;
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ SimpleDateFormat sdf = null;
+ if (date.contains(":")) {
+ sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ } else {
+ sdf = new SimpleDateFormat("yyyy-MM-dd");
+ }
try {
date1 = sdf.parse(date);
} catch (ParseException e) {
@@ -45,16 +50,7 @@
}
}, Date.class);
- ConvertUtils.register(new Converter() { //娉ㄥ唽涓�涓棩鏈熻浆鎹㈠櫒
-
- public Object convert(Class type, Object value) {
- Date date1 = null;
- if (value instanceof Date) {
- return DateUtil.getFormatTimeString((Date) value, DateUtil.DATE_FORMATE_STRING_A);
- }
- return value;
- }
- }, String.class);
+ ConvertUtils.register(new Java110StringConvert(), String.class);
}
--
Gitblit v1.8.0