From 2291fba3ed16336860050a4a18c6860cb2396b1b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 27 二月 2024 17:04:43 +0800
Subject: [PATCH] 优化代码

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

diff --git a/java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java b/java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java
old mode 100644
new mode 100755
index 3c8c757..ad26474
--- a/java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java
@@ -35,24 +35,33 @@
 
     @Override
     protected String convertToString(Object value) throws Throwable {
+        logger.debug("convertToString褰撳墠瀵硅薄绫诲瀷start" + value.getClass());
+
         if (value instanceof Date) {
             return DateUtil.getFormatTimeString((Date) value, DateUtil.DATE_FORMATE_STRING_A);
         }
-        logger.debug("褰撳墠瀵硅薄绫诲瀷" + value.getClass());
+        logger.debug("convertToString褰撳墠瀵硅薄绫诲瀷" + value.getClass());
         return super.convertToString(value);
     }
 
     @Override
-    protected Object convertToType(Class type, Object value) throws Throwable {
+    protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
         //System.out.printf("12313");
-        if (value instanceof Date) {
-            return DateUtil.getFormatTimeString((Date) value, DateUtil.DATE_FORMATE_STRING_A);
+        logger.debug("convertToType褰撳墠瀵硅薄绫诲瀷start" + value.getClass());
+
+        if(type.getClass().equals(String.class)) {
+	        if (value instanceof Date) {
+	            return type.cast(DateUtil.getFormatTimeString(Date.class.cast(value), DateUtil.DATE_FORMATE_STRING_A));
+	        }
+	        logger.debug("convertToType褰撳墠瀵硅薄绫诲瀷" + value.getClass());
+	        return type.cast(value.toString());
+        }else {
+        	return null;
         }
-        return value.toString();
     }
 
     @Override
-    protected Class getDefaultType() {
+    protected Class<?> getDefaultType() {
         return String.class;
     }
 }

--
Gitblit v1.8.0