add test

Author: xlorne

springboot-starter/src/main/java/com/codingapi/springboot/framework/domain/field/FieldValueInterceptor.java

@@ -76,7 +76,7 @@ public Object intercept(Object obj, Method method, Object[] args, MethodProxy pr
         }
 
         if(fields.isEmpty()){
-            this.readFields();
+            this.readFields(fields,target,propertyDescriptors);
         }
         Object result = method.invoke(target, args);
         this.compareAndUpdateField();
@@ -88,14 +88,28 @@ public Object intercept(Object obj, Method method, Object[] args, MethodProxy pr
      * @throws InvocationTargetException InvocationTargetException
      * @throws IllegalAccessException InvocationTargetException
      */
-    private void readFields() throws InvocationTargetException, IllegalAccessException {
+    private void readFields(Map<String,Object> fields, Object target,PropertyDescriptor[] propertyDescriptors) throws InvocationTargetException, IllegalAccessException {
         for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
             String name = propertyDescriptor.getName();
             Object value = propertyDescriptor.getReadMethod().invoke(target);
-            fields.put(name, value);
+            if (isPrimitive(value)) {
+                fields.put(name, value);
+            }else {
+                Map<String,Object> childFields = new HashMap<>();
+                this.readFields(childFields,value,BeanUtils.getPropertyDescriptors(value.getClass()));
+                fields.put(name, childFields);
+            }
         }
     }
 
+
+    private boolean isPrimitive(Object obj) {
+        return obj instanceof String || obj instanceof Integer || obj instanceof Long
+                || obj instanceof Double || obj instanceof Float || obj instanceof Boolean
+                || obj instanceof Short || obj instanceof Byte || obj instanceof Character
+                || obj instanceof Enum || obj instanceof Class;
+    }
+
     /**
      * 对比字段
      * @throws InvocationTargetException InvocationTargetException
@@ -106,10 +120,27 @@ private void compareAndUpdateField() throws InvocationTargetException, IllegalAc
             String name = propertyDescriptor.getName();
             Object newValue = propertyDescriptor.getReadMethod().invoke(target);
             Object oldValue = fields.get(name);
-            if (!newValue.equals(oldValue)) {
-                pushEvent(name, oldValue, newValue);
+            if(isPrimitive(newValue)) {
+                if (!newValue.equals(oldValue)) {
+                    pushEvent(name, oldValue, newValue);
+                }
+                fields.put(name, newValue);
+            }else{
+                Map<String,Object> newFields = new HashMap<>();
+                this.readFields(newFields,newValue,BeanUtils.getPropertyDescriptors(newValue.getClass()));
+
+                Map<String,Object> oldFields = (Map<String,Object>)oldValue;
+                for (String key:oldFields.keySet()){
+                    Object oldChildValue = oldFields.get(key);
+                    Object newChildValue = newFields.get(key);
+                    if(!oldChildValue.equals(newChildValue)){
+                        String namePrefix = name + ".";
+                        pushEvent(namePrefix+key, oldChildValue, newChildValue);
+                    }
+                }
+                fields.put(name, newFields);
             }
-            fields.put(name, newValue);
+
         }
     }
 

springboot-starter/src/test/java/com/codingapi/springboot/framework/domain/Ainimal.java

@@ -0,0 +1,11 @@
+package com.codingapi.springboot.framework.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class Ainimal {
+
+    private String name;
+}

springboot-starter/src/test/java/com/codingapi/springboot/framework/domain/Demo.java

@@ -14,16 +14,28 @@ public class Demo implements JsonSerializable, MapSerializable {
     @Getter
     private String name;
 
+    @Getter
+    private Ainimal ainimal;
+
     public Demo(String name) {
         this.name = name;
         this.id = System.currentTimeMillis();
+        this.ainimal = new Ainimal();
+        this.ainimal.setName("cat");
     }
 
     public void changeName(String name) {
         String beforeName = this.name;
         this.name = name;
-//        push event
+
+        if (beforeName.equals(name)) {
+            return;
+        }
+        //  push event
         EventPusher.push(new DemoChangeEvent(beforeName, name));
     }
 
+    public void changeAinimalName(String name) {
+        this.ainimal.setName(name);
+    }
 }

springboot-starter/src/test/java/com/codingapi/springboot/framework/domain/FieldProxyFactoryTest.java

@@ -10,6 +10,9 @@ class FieldProxyFactoryTest {
     @Test
     void createEntity() {
         Demo demo = FieldProxyFactory.create(Demo.class, "test");
-        demo.changeName("123");
+        demo.changeAinimalName("123");
+        demo.changeAinimalName("234");
+        demo.changeName("test");
+        demo.changeName("test123");
     }
 }