model

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/domain/EntityModel.java

@@ -193,13 +193,19 @@ public class EntityModel {
                 String columnExp=fieldModel.getColumnExp();
                 if(StringUtils.isEmpty(columnExp))
                     continue;
+                if(fieldModel.isPhysicalField())
+                    continue;
                 if(!StringUtils.isEmpty(columnSet)){
                     columnSet=columnSet+",";
                 }
                 columnSet=columnSet+columnExp;
             }
 
-           return "select "+columnSet+" from "+this.getTableName()+" ";
+            if(!StringUtils.isEmpty(columnSet)){
+                columnSet=columnSet+",";
+            }
+            columnSet=columnSet+"t.*";
+            return "select "+columnSet+" from "+this.getTableName()+" t ";
         }
         else if("CORE".equalsIgnoreCase(dataSet))
         {

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/domain/EntityObj.java

@@ -134,6 +134,8 @@ public class EntityObj extends DataObj<String,Object> {
 		return rowKey;
 	}
 
+    @JsonIgnore
+    @JSONField(serialize = false)
     @Override
     public Timestamp getTimestamp() {
         Timestamp lastModify=super.getTimestamp();

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/domain/ModelObj.java

@@ -4,10 +4,12 @@ import cn.ibizlab.core.lite.extensions.model.DataModel;
 import cn.ibizlab.core.lite.extensions.model.LayerMapping;
 import cn.ibizlab.core.lite.extensions.model.Property;
 import cn.ibizlab.core.lite.extensions.util.LiteStorage;
+import cn.ibizlab.util.helper.DataObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.springframework.util.StringUtils;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -221,6 +223,31 @@ public class ModelObj extends DataObj<String,Object> {
         return rowKey;
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @Override
+    public Timestamp getTimestamp()
+    {
+        Timestamp last = DataObject.getBeginDate();
+        for(Object sub:this.values())
+        {
+            if(sub == null)
+                continue;
+            else if(sub instanceof EntityObj)
+            {
+                if(((EntityObj)sub).getTimestamp().getTime()>last.getTime())
+                    last=((EntityObj)sub).getTimestamp();
+            }
+            else if(sub instanceof NestedArray)
+            {
+                if(((NestedArray)sub).getTimestamp().getTime()>last.getTime())
+                    last=((NestedArray)sub).getTimestamp();
+            }
+        }
+        this.setTimestamp(last);
+        return last;
+    }
+
     public ModelObj findParent(List<ModelObj> uplayerObjs)
     {
         if(uplayerObjs.size()==1)

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/domain/NestedArray.java

 package cn.ibizlab.core.lite.extensions.domain;
 
 import cn.ibizlab.core.lite.extensions.model.DataModel;
+import cn.ibizlab.util.helper.DataObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
 
 public class NestedArray extends ArrayList<ModelObj> {
@@ -51,4 +53,15 @@ public class NestedArray extends ArrayList<ModelObj> {
         return rt;
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
+    public Timestamp getTimestamp()
+    {
+        Timestamp last = DataObject.getBeginDate();
+        for(ModelObj sub:this)
+            if(sub.getTimestamp().getTime()>last.getTime())
+                last=sub.getTimestamp();
+        return last;
+    }
+
 }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/service/DbEntityService.java

@@ -155,6 +155,7 @@ public class DbEntityService extends ServiceImpl<DbEntityMapper, EntityObj> impl
         fillEntityObj(dataModel,rt);
         dataModel.getNestedDataModels().forEach(subModel->
                 this.getModelObjs(subModel, factEntityList).forEach(subObj->subObj.findParent(rt)));
+        rt.forEach(modelObj -> modelObj.getTimestamp());
         return rt;
     }
 

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/LiteCoreResource.java

@@ -57,7 +57,6 @@ public class LiteCoreResource {
         if(StringUtils.isEmpty(modelid))
             modelid="dataModelff8080816a8b510c016a8c2f18b10001";
         List<ModelObj> list=dbEntityService.getModelObjs(modelid, DataObject.getBeginDate());
-
         return ResponseEntity.ok(list);
     }