demoadmin 发布系统代码 [ibz-dst，应用]

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/IDABuildService.java

@@ -45,7 +45,6 @@ public interface IDABuildService extends IService<DABuild> {
     Page<DABuild> searchDefault(DABuildSearchContext context);
     List<DABuild> selectByModelId(String id);
     void removeByModelId(String id);
-    void saveByModelId(String id, List<DABuild> list) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DABuildServiceImpl.java

@@ -247,38 +247,6 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
         this.remove(new QueryWrapper<DABuild>().eq("modelid",id));
     }
 
-    public IDABuildService getProxyService() {
-        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
-    }
-	@Override
-    public void saveByModelId(String id,List<DABuild> list) {
-        if(list==null)
-            return;
-        Set<String> delIds=new HashSet<String>();
-        List<DABuild> _update=new ArrayList<DABuild>();
-        List<DABuild> _create=new ArrayList<DABuild>();
-        for(DABuild before:selectByModelId(id)){
-            delIds.add(before.getBuildId());
-        }
-        for(DABuild sub:list) {
-            sub.setModelId(id);
-            if(ObjectUtils.isEmpty(sub.getBuildId()))
-                sub.setBuildId((String)sub.getDefaultKey(true));
-            if(delIds.contains(sub.getBuildId())) {
-                delIds.remove(sub.getBuildId());
-                _update.add(sub);
-            }
-            else
-                _create.add(sub);
-        }
-        if(_update.size()>0)
-            getProxyService().updateBatch(_update);
-        if(_create.size()>0)
-            getProxyService().createBatch(_create);
-        if(delIds.size()>0)
-            getProxyService().removeBatch(delIds);
-	}
-
 
     /**
      * 查询集合 数据集
@@ -341,6 +309,9 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
 
 
 
+    public IDABuildService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/domain/MetaEntity.java

@@ -179,38 +179,6 @@ public class MetaEntity extends EntityMP implements Serializable {
     private cn.ibizlab.core.lite.domain.MetaModule module;
 
 
-    /**
-     * 数据集
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private List<cn.ibizlab.core.lite.domain.MetaDataSet> dataSets;
-
-    /**
-     * 属性
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private List<cn.ibizlab.core.lite.domain.MetaField> fields;
-
-    /**
-     * 实体关系
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private List<cn.ibizlab.core.lite.domain.MetaRelationship> parentEntitys;
-
-    /**
-     * 实体关系
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private List<cn.ibizlab.core.lite.domain.MetaRelationship> subEntitys;
-
 
     /**
      * 设置 [实体名]

ibzdst-core/src/main/java/cn/ibizlab/core/lite/domain/MetaModel.java

@@ -124,22 +124,6 @@ public class MetaModel extends EntityMP implements Serializable {
     private cn.ibizlab.core.lite.domain.DstSystem system;
 
 
-    /**
-     * 分析
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private List<cn.ibizlab.core.analysis.domain.DABuild> builds;
-
-    /**
-     * 规则
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private List<cn.ibizlab.core.rule.domain.RuleItem> ruleitems;
-
 
     /**
      * 设置 [名称]

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IMetaDataSetService.java

@@ -39,7 +39,6 @@ public interface IMetaDataSetService extends IService<MetaDataSet> {
     Page<MetaDataSet> searchDefault(MetaDataSetSearchContext context);
     List<MetaDataSet> selectByEntityId(String entity_id);
     void removeByEntityId(String entity_id);
-    void saveByEntityId(String entity_id, List<MetaDataSet> list) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IMetaFieldService.java

@@ -39,7 +39,6 @@ public interface IMetaFieldService extends IService<MetaField> {
     Page<MetaField> searchDefault(MetaFieldSearchContext context);
     List<MetaField> selectByEntityId(String entity_id);
     void removeByEntityId(String entity_id);
-    void saveByEntityId(String entity_id, List<MetaField> list) ;
     List<MetaField> selectByRefFieldId(String field_id);
     void removeByRefFieldId(String field_id);
     List<MetaField> selectByRelationId(String id);

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IMetaRelationshipService.java

@@ -39,10 +39,8 @@ public interface IMetaRelationshipService extends IService<MetaRelationship> {
     Page<MetaRelationship> searchDefault(MetaRelationshipSearchContext context);
     List<MetaRelationship> selectByEntityId(String entity_id);
     void removeByEntityId(String entity_id);
-    void saveByEntityId(String entity_id, List<MetaRelationship> list) ;
     List<MetaRelationship> selectByRefEntityId(String entity_id);
     void removeByRefEntityId(String entity_id);
-    void saveByRefEntityId(String entity_id, List<MetaRelationship> list) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaDataSetServiceImpl.java

@@ -198,38 +198,6 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
         this.remove(new QueryWrapper<MetaDataSet>().eq("entityid",entity_id));
     }
 
-    public IMetaDataSetService getProxyService() {
-        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
-    }
-	@Override
-    public void saveByEntityId(String entity_id,List<MetaDataSet> list) {
-        if(list==null)
-            return;
-        Set<String> delIds=new HashSet<String>();
-        List<MetaDataSet> _update=new ArrayList<MetaDataSet>();
-        List<MetaDataSet> _create=new ArrayList<MetaDataSet>();
-        for(MetaDataSet before:selectByEntityId(entity_id)){
-            delIds.add(before.getDatasetId());
-        }
-        for(MetaDataSet sub:list) {
-            sub.setEntityId(entity_id);
-            if(ObjectUtils.isEmpty(sub.getDatasetId()))
-                sub.setDatasetId((String)sub.getDefaultKey(true));
-            if(delIds.contains(sub.getDatasetId())) {
-                delIds.remove(sub.getDatasetId());
-                _update.add(sub);
-            }
-            else
-                _create.add(sub);
-        }
-        if(_update.size()>0)
-            getProxyService().updateBatch(_update);
-        if(_create.size()>0)
-            getProxyService().createBatch(_create);
-        if(delIds.size()>0)
-            getProxyService().removeBatch(delIds);
-	}
-
 
     /**
      * 查询集合 数据集
@@ -291,6 +259,9 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
 
 
 
+    public IMetaDataSetService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java

@@ -76,10 +76,6 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         if(!this.retBool(this.baseMapper.insert(et))) {
             return false;
         }
-        metadatasetService.saveByEntityId(et.getEntityId(), et.getDataSets());
-        metafieldService.saveByEntityId(et.getEntityId(), et.getFields());
-        metarelationshipService.saveByEntityId(et.getEntityId(), et.getParentEntitys());
-        metarelationshipService.saveByRefEntityId(et.getEntityId(), et.getSubEntitys());
         CachedBeanCopier.copy(get(et.getEntityId()), et);
         return true;
     }
@@ -98,10 +94,6 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("entityid", et.getEntityId()))) {
             return false;
         }
-        metadatasetService.saveByEntityId(et.getEntityId(), et.getDataSets());
-        metafieldService.saveByEntityId(et.getEntityId(), et.getFields());
-        metarelationshipService.saveByEntityId(et.getEntityId(), et.getParentEntitys());
-        metarelationshipService.saveByRefEntityId(et.getEntityId(), et.getSubEntitys());
         CachedBeanCopier.copy(get(et.getEntityId()), et);
         return true;
     }
@@ -116,10 +108,6 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
     @Override
     @Transactional
     public boolean remove(String key) {
-        metadatasetService.removeByEntityId(key) ;
-        metafieldService.removeByEntityId(key) ;
-        metarelationshipService.removeByEntityId(key) ;
-        metarelationshipService.removeByRefEntityId(key) ;
         boolean result = removeById(key);
         return result ;
     }
@@ -139,10 +127,6 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
             et.setEntityId(key);
         }
         else {
-            et.setDataSets(metadatasetService.selectByEntityId(key));
-            et.setFields(metafieldService.selectByEntityId(key));
-            et.setParentEntitys(metarelationshipService.selectByEntityId(key));
-            et.setSubEntitys(metarelationshipService.selectByRefEntityId(key));
         }
         return et;
     }

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java

@@ -203,38 +203,6 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
         this.remove(new QueryWrapper<MetaField>().eq("entityid",entity_id));
     }
 
-    public IMetaFieldService getProxyService() {
-        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
-    }
-	@Override
-    public void saveByEntityId(String entity_id,List<MetaField> list) {
-        if(list==null)
-            return;
-        Set<String> delIds=new HashSet<String>();
-        List<MetaField> _update=new ArrayList<MetaField>();
-        List<MetaField> _create=new ArrayList<MetaField>();
-        for(MetaField before:selectByEntityId(entity_id)){
-            delIds.add(before.getFieldId());
-        }
-        for(MetaField sub:list) {
-            sub.setEntityId(entity_id);
-            if(ObjectUtils.isEmpty(sub.getFieldId()))
-                sub.setFieldId((String)sub.getDefaultKey(true));
-            if(delIds.contains(sub.getFieldId())) {
-                delIds.remove(sub.getFieldId());
-                _update.add(sub);
-            }
-            else
-                _create.add(sub);
-        }
-        if(_update.size()>0)
-            getProxyService().updateBatch(_update);
-        if(_create.size()>0)
-            getProxyService().createBatch(_create);
-        if(delIds.size()>0)
-            getProxyService().removeBatch(delIds);
-	}
-
 	@Override
     public List<MetaField> selectByRefFieldId(String field_id) {
         return baseMapper.selectByRefFieldId(field_id);
@@ -338,6 +306,9 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
 
 
 
+    public IMetaFieldService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModelServiceImpl.java

@@ -69,8 +69,6 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
         if(!this.retBool(this.baseMapper.insert(et))) {
             return false;
         }
-        dabuildService.saveByModelId(et.getId(), et.getBuilds());
-        ruleitemService.saveByModelId(et.getId(), et.getRuleitems());
         CachedBeanCopier.copy(get(et.getId()), et);
         return true;
     }
@@ -87,8 +85,6 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
         if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("modelid", et.getId()))) {
             return false;
         }
-        dabuildService.saveByModelId(et.getId(), et.getBuilds());
-        ruleitemService.saveByModelId(et.getId(), et.getRuleitems());
         CachedBeanCopier.copy(get(et.getId()), et);
         return true;
     }
@@ -102,8 +98,6 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
     @Override
     @Transactional
     public boolean remove(String key) {
-        dabuildService.removeByModelId(key) ;
-        ruleitemService.removeByModelId(key) ;
         boolean result = removeById(key);
         return result ;
     }
@@ -123,8 +117,6 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
             et.setId(key);
         }
         else {
-            et.setBuilds(dabuildService.selectByModelId(key));
-            et.setRuleitems(ruleitemService.selectByModelId(key));
         }
         return et;
     }

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaRelationshipServiceImpl.java

@@ -201,38 +201,6 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
         this.remove(new QueryWrapper<MetaRelationship>().eq("entityid",entity_id));
     }
 
-    public IMetaRelationshipService getProxyService() {
-        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
-    }
-	@Override
-    public void saveByEntityId(String entity_id,List<MetaRelationship> list) {
-        if(list==null)
-            return;
-        Set<String> delIds=new HashSet<String>();
-        List<MetaRelationship> _update=new ArrayList<MetaRelationship>();
-        List<MetaRelationship> _create=new ArrayList<MetaRelationship>();
-        for(MetaRelationship before:selectByEntityId(entity_id)){
-            delIds.add(before.getId());
-        }
-        for(MetaRelationship sub:list) {
-            sub.setEntityId(entity_id);
-            if(ObjectUtils.isEmpty(sub.getId()))
-                sub.setId((String)sub.getDefaultKey(true));
-            if(delIds.contains(sub.getId())) {
-                delIds.remove(sub.getId());
-                _update.add(sub);
-            }
-            else
-                _create.add(sub);
-        }
-        if(_update.size()>0)
-            getProxyService().updateBatch(_update);
-        if(_create.size()>0)
-            getProxyService().createBatch(_create);
-        if(delIds.size()>0)
-            getProxyService().removeBatch(delIds);
-	}
-
 	@Override
     public List<MetaRelationship> selectByRefEntityId(String entity_id) {
         return baseMapper.selectByRefEntityId(entity_id);
@@ -242,35 +210,6 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
         this.remove(new QueryWrapper<MetaRelationship>().eq("refentityid",entity_id));
     }
 
-	@Override
-    public void saveByRefEntityId(String entity_id,List<MetaRelationship> list) {
-        if(list==null)
-            return;
-        Set<String> delIds=new HashSet<String>();
-        List<MetaRelationship> _update=new ArrayList<MetaRelationship>();
-        List<MetaRelationship> _create=new ArrayList<MetaRelationship>();
-        for(MetaRelationship before:selectByRefEntityId(entity_id)){
-            delIds.add(before.getId());
-        }
-        for(MetaRelationship sub:list) {
-            sub.setRefEntityId(entity_id);
-            if(ObjectUtils.isEmpty(sub.getId()))
-                sub.setId((String)sub.getDefaultKey(true));
-            if(delIds.contains(sub.getId())) {
-                delIds.remove(sub.getId());
-                _update.add(sub);
-            }
-            else
-                _create.add(sub);
-        }
-        if(_update.size()>0)
-            getProxyService().updateBatch(_update);
-        if(_create.size()>0)
-            getProxyService().createBatch(_create);
-        if(delIds.size()>0)
-            getProxyService().removeBatch(delIds);
-	}
-
 
     /**
      * 查询集合 数据集
@@ -343,6 +282,9 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
 
 
 
+    public IMetaRelationshipService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/IRuleItemService.java

@@ -43,7 +43,6 @@ public interface IRuleItemService extends IService<RuleItem> {
     Page<RuleItem> searchDefault(RuleItemSearchContext context);
     List<RuleItem> selectByModelId(String id);
     void removeByModelId(String id);
-    void saveByModelId(String id, List<RuleItem> list) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleItemServiceImpl.java

@@ -233,38 +233,6 @@ public class RuleItemServiceImpl extends ServiceImpl<RuleItemMapper, RuleItem> i
         this.remove(new QueryWrapper<RuleItem>().eq("modelid",id));
     }
 
-    public IRuleItemService getProxyService() {
-        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
-    }
-	@Override
-    public void saveByModelId(String id,List<RuleItem> list) {
-        if(list==null)
-            return;
-        Set<String> delIds=new HashSet<String>();
-        List<RuleItem> _update=new ArrayList<RuleItem>();
-        List<RuleItem> _create=new ArrayList<RuleItem>();
-        for(RuleItem before:selectByModelId(id)){
-            delIds.add(before.getRuleId());
-        }
-        for(RuleItem sub:list) {
-            sub.setModelId(id);
-            if(ObjectUtils.isEmpty(sub.getRuleId()))
-                sub.setRuleId((String)sub.getDefaultKey(true));
-            if(delIds.contains(sub.getRuleId())) {
-                delIds.remove(sub.getRuleId());
-                _update.add(sub);
-            }
-            else
-                _create.add(sub);
-        }
-        if(_update.size()>0)
-            getProxyService().updateBatch(_update);
-        if(_create.size()>0)
-            getProxyService().createBatch(_create);
-        if(delIds.size()>0)
-            getProxyService().removeBatch(delIds);
-	}
-
 
     /**
      * 查询集合 数据集
@@ -327,6 +295,9 @@ public class RuleItemServiceImpl extends ServiceImpl<RuleItemMapper, RuleItem> i
 
 
 
+    public IRuleItemService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

ibzdst-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="root" id="tab-da_build-81-1">
+    <changeSet author="root" id="tab-da_build-82-1">
         <createTable tableName="IBZDABUILD">
                 <column name="BUILDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
@@ -210,7 +210,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="root" id="tab-meta_dataset-2-9">
+    <changeSet author="root" id="tab-meta_dataset-3-9">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -232,7 +232,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="root" id="tab-meta_entity-13-10">
+    <changeSet author="root" id="tab-meta_entity-17-10">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -264,7 +264,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="root" id="tab-meta_field-7-11">
+    <changeSet author="root" id="tab-meta_field-8-11">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -328,7 +328,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="root" id="tab-meta_model-75-12">
+    <changeSet author="root" id="tab-meta_model-77-12">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
@@ -372,7 +372,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="root" id="tab-meta_relation-6-14">
+    <changeSet author="root" id="tab-meta_relation-9-14">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
@@ -432,7 +432,7 @@
 
 
     <!--输出实体[RU_ITEM]数据结构 -->
-    <changeSet author="root" id="tab-ru_item-80-16">
+    <changeSet author="root" id="tab-ru_item-81-16">
         <createTable tableName="IBZRULE">
                 <column name="RULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>