From e2bd1178de6a86bb0f84770a0f9248d621c99747 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 22 十月 2022 17:08:07 +0800
Subject: [PATCH] 优化 场馆显示功能
---
java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 04854e5..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
@@ -1,6 +1,8 @@
package com.java110.utils.util;
import org.apache.commons.beanutils.converters.AbstractConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Date;
@@ -8,6 +10,7 @@
* 鑷畾涔� String 澶勭悊
*/
public class Java110StringConvert extends AbstractConverter {
+ private static Logger logger = LoggerFactory.getLogger(Java110StringConvert.class);
/**
@@ -23,8 +26,8 @@
* a default value if an error occurs.
*
* @param defaultValue The default value to be returned
- * if the value to be converted is missing or an error
- * occurs converting the value.
+ * if the value to be converted is missing or an error
+ * occurs converting the value.
*/
public Java110StringConvert(Object defaultValue) {
super(defaultValue);
@@ -32,23 +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("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