From 83a1aa3133ce9c35fb428d0cdf4a84adda4ba3ac Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 24 四月 2024 16:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/boying/util/PlateComparator.java |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/boying/util/PlateComparator.java b/src/main/java/com/boying/util/PlateComparator.java
index 461a8f5..5ac353a 100644
--- a/src/main/java/com/boying/util/PlateComparator.java
+++ b/src/main/java/com/boying/util/PlateComparator.java
@@ -1,9 +1,16 @@
 package com.boying.util;
 
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
+import org.springframework.beans.BeanUtils;
 import com.boying.entity.EnterPark;
 
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -20,10 +27,33 @@
         List<Map<String,Object>> list = new ArrayList<>();
         for (EnterPark enterPark : enterParkList) {
             int i = compareLicensePlates(carNo, enterPark.getCarNo());
-            if (i<=2){
-                Map<String, Object> map = BeanUtils.beanToMap(enterPark);
-                map.put("count",i); // 鏂板娆℃暟
-                list.add(map);
+            if (i<2){
+                Map<String, Object> returnMap = new HashMap<String, Object>();
+                BeanInfo beanInfo = null;
+                try {
+                    beanInfo = Introspector.getBeanInfo(enterPark.getClass());
+                    PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+                    for (PropertyDescriptor pd : propertyDescriptors) {
+                        String propertyName = pd.getName();
+                        if (!"class".equals(propertyName)) {
+                            Method readMethod = pd.getReadMethod();
+                            Object result = readMethod.invoke(enterPark);
+                            if (result != null) {
+                                returnMap.put(propertyName, result);
+                            } else {
+                                returnMap.put(propertyName, "");
+                            }
+                        }
+                    }
+                } catch (IntrospectionException e) {
+                    e.printStackTrace();
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                } catch (InvocationTargetException e) {
+                    e.printStackTrace();
+                }
+                returnMap.put("count",i); // 鏂板娆℃暟
+                list.add(returnMap);
             }
         }
         return list;

--
Gitblit v1.9.1