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/BeanConvertUtil.java |   84 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 69 insertions(+), 15 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java b/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
old mode 100644
new mode 100755
index ec1ebc7..4d1ba8f
--- a/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
@@ -1,17 +1,18 @@
 package com.java110.utils.util;
 
 
-import org.apache.commons.beanutils.BeanUtils;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.Converter;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.cglib.beans.BeanMap;
 
+import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ClassName BeanConvertUtil
@@ -29,9 +30,9 @@
     static {
         ConvertUtils.register(new Converter() { //娉ㄥ唽涓�涓棩鏈熻浆鎹㈠櫒
 
-            public Object convert(Class type, Object value) {
+            public <T> T convert(Class<T> type, Object value) {
                 Date date1 = null;
-                if (value instanceof String) {
+                if (value instanceof String && type.getClass().equals(Date.class)) {
                     String date = (String) value;
                     SimpleDateFormat sdf = null;
                     if (date.contains(":")) {
@@ -44,11 +45,13 @@
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
-                    return date1;
+                    return type.cast(date1);
                 }
-                return value;
+                return null;
             }
+
         }, Date.class);
+
 
         ConvertUtils.register(new Java110StringConvert(), String.class);
     }
@@ -67,11 +70,38 @@
     public static <T1, T2> T2 covertBean(T1 orgBean, T2 dstBean) {
 
         try {
-            BeanUtils.copyProperties(dstBean, orgBean);
+            //BeanUtils.copyProperties(dstBean, orgBean);
+            if (orgBean instanceof Map) {
+                BeanMap beanMap = BeanMap.create(dstBean);
+                //beanMap.putAll((Map)orgBean);
+                objectFieldsPutMap(dstBean, beanMap, (Map) orgBean);
+                return dstBean;
+            }
+            final BeanCopier beanCopier = BeanCopier.create(orgBean.getClass(), dstBean.getClass(), true);
+            beanCopier.copy(orgBean, dstBean, new Java110Converter());
         } catch (Exception e) {
+            e.printStackTrace();
             throw new RuntimeException("bean杞崲bean澶辫触", e);
         }
         return dstBean;
+    }
+
+    private static void objectFieldsPutMap(Object dstBean, BeanMap beanMap, Map<String, Object> orgMap) {
+        //Field[] fields = dstBean.getClass().getDeclaredFields();
+        Field[] fields = FieldUtils.getAllFields(dstBean.getClass());
+        for (Field field : fields) {
+            if (!orgMap.containsKey(field.getName())) {
+                continue;
+            }
+            Class<?> dstClass = field.getType();
+            //System.out.println("瀛楁绫诲瀷" + dstClass);
+
+            Object value = orgMap.get(field.getName());
+            //String 杞琩ate
+            Object tmpValue = Java110Converter.getValue(value, dstClass);
+            System.out.println("tmpValue"+value.toString());
+            beanMap.put(field.getName(), tmpValue);
+        }
     }
 
     /**
@@ -89,7 +119,7 @@
         T2 returnModel = null;
         try {
             returnModel = t.newInstance();
-            BeanUtils.copyProperties(returnModel, orgBean);
+            covertBean(orgBean, returnModel);
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("bean杞崲bean澶辫触", e);
@@ -123,15 +153,39 @@
      * @return map瀵硅薄
      */
     public static Map beanCovertMap(Object orgBean) {
-        Map newMap = null;
 
+        Map<String, Object> map = new HashMap();
         try {
-            newMap = PropertyUtils.describe(orgBean);
+            BeanMap beanMap = BeanMap.create(orgBean);
+            for (Object key : beanMap.keySet()) {
+                map.put(key + "", beanMap.get(key));
+            }
         } catch (Exception e) {
             throw new RuntimeException("bean杞崲Map澶辫触", e);
         }
+        return map;
+    }
 
-        return newMap;
+    /**
+     * bean杞崲涓簃ap瀵硅薄
+     *
+     * @param orgBean 鍘熷bean
+     * @return map瀵硅薄
+     */
+    public static JSONObject beanCovertJson(Object orgBean) {
+
+        return JSONObject.parseObject(JSONObject.toJSONString(orgBean));
+    }
+
+    /**
+     * bean杞崲涓簃ap瀵硅薄
+     *
+     * @param orgBean 鍘熷bean
+     * @return map瀵硅薄
+     */
+    public static JSONArray beanCovertJSONArray(Object orgBean) {
+
+        return JSONArray.parseArray(JSONArray.toJSONStringWithDateFormat(orgBean, "yyyy-MM-dd HH:mm:ss"));
     }
 
 

--
Gitblit v1.8.0