From 1b191f5d077f74a1440664206234a318ad6abdbc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 15 六月 2020 16:40:03 +0800
Subject: [PATCH] 优化代码

---
 java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java b/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
index bd88b74..2abad8f 100644
--- a/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
@@ -26,6 +26,10 @@
     }
 
     public static Object getValue(Object value, Class target) {
+
+        if (value == null) {
+            return value;
+        }
         //1.0 String 杞� Date
         if (value instanceof String && target == Date.class) {
             String date = (String) value;
@@ -59,6 +63,17 @@
             }
             return newDate;
         }
+        // 3.0 Timestamp 杞� String
+        if (value instanceof Timestamp && target == String.class) {
+            Date date = new Date(((Timestamp) value).getTime());
+            String newDate = null;
+            try {
+                newDate = sdf.format(date);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return newDate;
+        }
 
         if (value instanceof BigDecimal) {
             BigDecimal bd = (BigDecimal) value;

--
Gitblit v1.8.0