ibiz4j 发布系统代码

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

@@ -129,7 +129,7 @@ public class MetaEntity extends EntityMP implements Serializable {
     @JsonIgnore
     @JSONField(serialize = false)
     @TableField(exist = false)
-    private List<cn.ibizlab.core.lite.domain.MetaDataSet> datasets;
+    private List<cn.ibizlab.core.lite.domain.MetaDataSet> metadataset;
 
     /**
      * 属性
@@ -137,7 +137,7 @@ public class MetaEntity extends EntityMP implements Serializable {
     @JsonIgnore
     @JSONField(serialize = false)
     @TableField(exist = false)
-    private List<cn.ibizlab.core.lite.domain.MetaField> fields;
+    private List<cn.ibizlab.core.lite.domain.MetaField> metafield;
 
     /**
      * 实体关系
@@ -145,7 +145,7 @@ public class MetaEntity extends EntityMP implements Serializable {
     @JsonIgnore
     @JSONField(serialize = false)
     @TableField(exist = false)
-    private List<cn.ibizlab.core.lite.domain.MetaRelationship> parententitys;
+    private List<cn.ibizlab.core.lite.domain.MetaRelationship> metarelationship;
 
     /**
      * 实体关系
@@ -153,7 +153,7 @@ public class MetaEntity extends EntityMP implements Serializable {
     @JsonIgnore
     @JSONField(serialize = false)
     @TableField(exist = false)
-    private List<cn.ibizlab.core.lite.domain.MetaRelationship> subentitys;
+    private List<cn.ibizlab.core.lite.domain.MetaRelationship> metarelationship;
 
 
     /**

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

@@ -72,10 +72,10 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         fillParentData(et);
         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());
+        metadatasetService.saveByEntityId(et.getEntityId(),et.getMetadataset());
+        metafieldService.saveByEntityId(et.getEntityId(),et.getMetafield());
+        metarelationshipService.saveByEntityId(et.getEntityId(),et.getMetarelationship());
+        metarelationshipService.saveByRefEntityId(et.getEntityId(),et.getMetarelationship());
         CachedBeanCopier.copy(get(et.getEntityId()),et);
         return true;
     }
@@ -93,10 +93,10 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         fillParentData(et);
          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());
+        metadatasetService.saveByEntityId(et.getEntityId(),et.getMetadataset());
+        metafieldService.saveByEntityId(et.getEntityId(),et.getMetafield());
+        metarelationshipService.saveByEntityId(et.getEntityId(),et.getMetarelationship());
+        metarelationshipService.saveByRefEntityId(et.getEntityId(),et.getMetarelationship());
         CachedBeanCopier.copy(get(et.getEntityId()),et);
         return true;
     }
@@ -134,10 +134,10 @@ 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));
+            et.setMetadataset(metadatasetService.selectByEntityId(key));
+            et.setMetafield(metafieldService.selectByEntityId(key));
+            et.setMetarelationship(metarelationshipService.selectByEntityId(key));
+            et.setMetarelationship(metarelationshipService.selectByRefEntityId(key));
         }
         return et;
     }

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

@@ -134,7 +134,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-16-7">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-18-7">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -156,7 +156,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-37-8">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-45-8">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -178,7 +178,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_field-96-9">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_field-98-9">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -258,7 +258,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-41-12">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-45-12">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
@@ -292,7 +292,7 @@
         <!--输出实体[DST_VIEW]外键关系 -->
         <!--输出实体[META_DATASET]外键关系 -->
         <!--输出实体[META_ENTITY]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-meta_entity-37-13">
+    <changeSet author="a_A_5d9d78509" id="fk-meta_entity-45-13">
        <addForeignKeyConstraint baseColumnNames="DSID" baseTableName="IBZENTITY" constraintName="DER1N_META_ENTITY_DST_DATASOUR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DSID" referencedTableName="IBZDATASOURCE" validate="true"/>
     </changeSet>
         <!--输出实体[META_FIELD]外键关系 -->