tmp

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/model/DataModel.java

@@ -23,6 +23,7 @@ public class DataModel {
     @JSONField(serialize = false)
     private DataModel parentDataModel;
 
+    @JSONField(ordinal = 1)
     private String dataModelName;
     public String getDataModelName()
     {
@@ -35,6 +36,7 @@ public class DataModel {
         return dataModelName;
     }
 
+    @JSONField(ordinal = 2)
     private LinkedHashSet<Property> objectProperties = new LinkedHashSet<>();
     public void setObjectProperties(LinkedHashSet<Property> objectProperties) {
         if(objectProperties!=null) {
@@ -43,6 +45,7 @@ public class DataModel {
         }
     }
 
+    @JSONField(ordinal = 3)
     private LinkedHashSet<DataModel> nestedDataModels = new LinkedHashSet<>();
     public void setNestedDataModels(LinkedHashSet<DataModel> nestedDataModels) {
         if(nestedDataModels!=null) {
@@ -51,6 +54,7 @@ public class DataModel {
         }
     }
 
+    @JSONField(ordinal = 4)
     private LinkedHashSet<LayerMapping> layerMappings = new LinkedHashSet<>();
     public void setLayerMappings(LinkedHashSet<LayerMapping> layerMappings)
     {

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/model/LayerMapping.java

@@ -50,6 +50,7 @@ public class LayerMapping {
         return "";
     }
 
+    @JSONField(ordinal = 1)
     private String selfPropertyColumn;
 
     @JsonIgnore
@@ -87,6 +88,7 @@ public class LayerMapping {
         return "";
     }
 
+    @JSONField(ordinal = 2)
     private String parentPropertyColumn;
 
     @Override

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/model/Model.java

@@ -19,14 +19,19 @@ import java.util.LinkedHashSet;
 @Accessors(chain = true)
 public class Model {
 
+    @JSONField(ordinal = 1)
     private String id;
 
+    @JSONField(ordinal = 2)
     private String name;
 
+    @JSONField(ordinal = 3)
     private String system;
 
+    @JSONField(ordinal = 4)
     private String factEntity;
 
+    @JSONField(ordinal = 5)
     private DataModel model;
 
 
@@ -40,7 +45,7 @@ public class Model {
         Model model=JSONObject.toJavaObject(jo, Model.class);
 
 
-        System.out.println(model.model.toString());
+        System.out.println(JSONObject.toJSONString(model));
     }
 
 }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/model/Property.java

@@ -25,12 +25,16 @@ public class Property {
     @JSONField(serialize = false)
     private DataModel ownerDataModel;
 
+    @JSONField(ordinal = 1)
     private String propertyName;
 
+    @JSONField(ordinal = 2)
     private String system;
 
+    @JSONField(ordinal = 3)
     private String propertyEntity;
 
+    @JSONField(ordinal = 4)
     private LinkedHashSet<PropertyMapping> propertyMappings = new LinkedHashSet<>();
     public void setPropertyMappings(LinkedHashSet<PropertyMapping> propertyMappings)
     {

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/model/PropertyMapping.java

@@ -51,8 +51,10 @@ public class PropertyMapping {
         return "";
     }
 
+    @JSONField(ordinal = 1)
     private String selfPropertyColumn;
 
+    @JSONField(ordinal = 2)
     private String joinPropertyName;
 
     public String getJoinPropertyName()
@@ -79,6 +81,7 @@ public class PropertyMapping {
         return "";
     }
 
+    @JSONField(ordinal = 3)
     private String joinPropertyColumn;
 
     @Override

ibzlite-core/src/main/resources/liquibase/changelog/20201029010527_changelog.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-3.8.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
+    <changeSet author="mac (generated)" id="1603933536067-1">
+        <addColumn tableName="IBZFIELD">
+            <column name="ISENABLEAUDIT" type="INTEGER"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>