From dbea8ec9fde739d028d656ac7031091fae6e6c2c Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:03:50 +0800
Subject: [PATCH] 1、新增费用提前预生成账单2、优化强制回单3、区配置新增退费收据开关4、权限优化

---
 java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java |   54 ++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 40 insertions(+), 14 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 b554b43..71b1eda
--- 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,10 +1,10 @@
 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;
@@ -12,12 +12,7 @@
 import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @ClassName BeanConvertUtil
@@ -35,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(":")) {
@@ -50,10 +45,11 @@
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
-                    return date1;
+                    return type.cast(date1);
                 }
-                return value;
+                return null;
             }
+
         }, Date.class);
 
 
@@ -73,6 +69,10 @@
      */
     public static <T1, T2> T2 covertBean(T1 orgBean, T2 dstBean) {
 
+        if(orgBean == null){
+            return dstBean;
+        }
+
         try {
             //BeanUtils.copyProperties(dstBean, orgBean);
             if (orgBean instanceof Map) {
@@ -90,19 +90,23 @@
         return dstBean;
     }
 
-    private static void objectFieldsPutMap(Object dstBean, BeanMap beanMap, Map orgMap) {
+    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();
+            Class<?> dstClass = field.getType();
             //System.out.println("瀛楁绫诲瀷" + dstClass);
 
             Object value = orgMap.get(field.getName());
+            if(value == null){
+                continue;
+            }
             //String 杞琩ate
             Object tmpValue = Java110Converter.getValue(value, dstClass);
+            //System.out.println("tmpValue"+value.toString());
             beanMap.put(field.getName(), tmpValue);
         }
     }
@@ -169,6 +173,28 @@
         return map;
     }
 
+    /**
+     * 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"));
+    }
+
 
     /**
      * bean闆嗗悎杞崲涓簃ap瀵硅薄闆嗗悎

--
Gitblit v1.8.0