From 9ef9076a630ead624c2c24bee28454836eb25b84 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 20 九月 2024 08:24:48 +0800
Subject: [PATCH] 初步改完,接下来进行测试

---
 src/main/java/com/zy/asrs/utils/MatCompareUtils.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/MatCompareUtils.java b/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
index 69a0fc0..2dd3c86 100644
--- a/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
+++ b/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
@@ -1,6 +1,8 @@
 package com.zy.asrs.utils;
 
 import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.common.model.LocDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,8 +25,8 @@
         for (String fieldName : sameFields) {
             Object fieldValue1 = getFieldValue(object1, fieldName);
             Object fieldValue2 = getFieldValue(object2, fieldName);
-            if (isSame(fieldValue1, fieldValue2)) {
-                log.info("瀛楁{}淇℃伅涓�鑷达紝{}-{}", fieldName, fieldValue1, fieldValue2);
+            if (!isSame(fieldValue1, fieldValue2)) {
+                log.info("瀛楁{}淇℃伅涓嶄竴鑷达紝{}_{}-{}_{}", fieldName, object1.getClass(), fieldValue1, object2.getClass(), fieldValue2);
                 return false;
             }
         }
@@ -46,15 +48,21 @@
         Field field = null;
         try {
             field = aClass.getDeclaredField(fieldName);
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-        field.setAccessible(true); // 璁剧疆涓哄彲璁块棶
-        try {
+            // 璁剧疆涓哄彲璁块棶
+            field.setAccessible(true);
             return field.get(object);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            log.error("瀛楁{}缂哄け,瀵硅薄{}", fieldName, object);
+            return null;
         }
     }
 
+    public static void main(String[] args) {
+        LocDto locDto = new LocDto();
+        locDto.setMatnr("123");
+        OrderDetl orderDetl = new OrderDetl();
+        orderDetl.setMatnr("123");
+        System.out.println(compare(locDto, orderDetl));
+    }
+
 }

--
Gitblit v1.9.1