model

.gitignore

@@ -12,3 +12,4 @@
 **.iml
 *.jar
 *.log
+.DS_Store
\ No newline at end of file

app_web/yarn.lock

@@ -2497,6 +2497,22 @@ bootstrap-vue@^2.18.1:
   resolved "https://registry.npm.taobao.org/bootstrap/download/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6"
   integrity sha1-xqcrNVqvMjkgvoACRqbk7zCZf+Y=
 
+bootstrap-vue@^2.18.1:
+  version "2.18.1"
+  resolved "https://registry.npm.taobao.org/bootstrap-vue/download/bootstrap-vue-2.18.1.tgz#4378d26b713d4255b45b42b3f852f6fa0a11d400"
+  integrity sha1-Q3jSa3E9QlW0W0Kz+FL2+goR1AA=
+  dependencies:
+    "@nuxt/opencollective" "^0.3.2"
+    bootstrap ">=4.5.3 <5.0.0"
+    popper.js "^1.16.1"
+    portal-vue "^2.1.7"
+    vue-functional-data-merge "^3.1.0"
+
+"bootstrap@>=4.5.3 <5.0.0":
+  version "4.5.3"
+  resolved "https://registry.npm.taobao.org/bootstrap/download/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6"
+  integrity sha1-xqcrNVqvMjkgvoACRqbk7zCZf+Y=
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -2908,6 +2924,14 @@ chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha1-ThSHCmGNni7dl92DRf2dncMVZGo=
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 check-more-types@2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
@@ -3283,6 +3307,11 @@ consola@^2.15.0:
   resolved "https://registry.npm.taobao.org/consola/download/consola-2.15.0.tgz#40fc4eefa4d2f8ef2e2806147f056ea207fcc0e9"
   integrity sha1-QPxO76TS+O8uKAYUfwVuogf8wOk=
 
+consola@^2.15.0:
+  version "2.15.0"
+  resolved "https://registry.npm.taobao.org/consola/download/consola-2.15.0.tgz?cache=0&sync_timestamp=1596627399144&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fconsola%2Fdownload%2Fconsola-2.15.0.tgz#40fc4eefa4d2f8ef2e2806147f056ea207fcc0e9"
+  integrity sha1-QPxO76TS+O8uKAYUfwVuogf8wOk=
+
 console-browserify@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
@@ -7299,6 +7328,11 @@ node-fetch@^2.6.1:
   resolved "https://registry.npm.taobao.org/node-fetch/download/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha1-BFvTI2Mfdu0uK1VXM5RBa2OaAFI=
 
+node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.npm.taobao.org/node-fetch/download/node-fetch-2.6.1.tgz?cache=0&sync_timestamp=1599309179354&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-fetch%2Fdownload%2Fnode-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha1-BFvTI2Mfdu0uK1VXM5RBa2OaAFI=
+
 node-forge@0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"

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

@@ -77,6 +77,20 @@ public class EntityModel {
         return fieldMap;
     }
 
+    public FieldModel getLastModifyField()
+    {
+        if(fields!=null)
+        {
+            for(FieldModel fieldModel:fields)
+            {
+                if("UPDATEDATE".equals(fieldModel.getField().getPredefined()))
+                {
+                    return fieldModel;
+                }
+            }
+        }
+        return null;
+    }
 
 
     public FieldModel getField(String name)

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

@@ -2,16 +2,23 @@ package cn.ibizlab.core.lite.extensions.service;
 
 import cn.ibizlab.core.lite.extensions.domain.EntityModel;
 import cn.ibizlab.core.lite.extensions.domain.EntityObj;
+import cn.ibizlab.core.lite.extensions.domain.FieldModel;
+import cn.ibizlab.core.lite.extensions.domain.ModelObj;
 import cn.ibizlab.core.lite.extensions.filter.DbEntitySearchContext;
+import cn.ibizlab.core.lite.extensions.model.DataModel;
+import cn.ibizlab.core.lite.extensions.util.LiteStorage;
 import cn.ibizlab.core.extensions.mapper.DbEntityMapper;
 import cn.ibizlab.util.filter.QueryFilter;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -59,4 +66,24 @@ public class DbEntityService extends ServiceImpl<DbEntityMapper, EntityObj> impl
             DynamicDataSourceContextHolder.poll();
         }
     }
+
+
+    @Autowired
+    private LiteModelService liteModelService;
+
+    public List<ModelObj> getModelObjs(DataModel dataModel,Timestamp lastModify)
+    {
+
+        EntityModel entityModel=liteModelService.getEntityModel(dataModel.getFactPorperty().getSystem(), dataModel.getFactPorperty().getPropertyEntity());
+        FieldModel lastModifyField=entityModel.getLastModifyField();
+        QueryFilter filter=new QueryFilter();
+        
+        if(lastModifyField!=null)
+            filter.ge(lastModifyField.getColumnName(), lastModify);
+
+        List<EntityObj> kEntityObjs=this.selectCore(entityModel, filter);
+        
+        return new ArrayList<>();
+    }
+
 }