Skip to content

I
ibzdst
提交 f6266e27 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 a520dcec
显示空白字符变更
内嵌 并排
正在显示 包含 178 行增加 和 92 行删除
app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_BO_CN_base.ts
浏览文件 @ f6266e27
...@@ -9,11 +9,13 @@ function getLocaleResourceBase(){ ...@@ -9,11 +9,13 @@ function getLocaleResourceBase(){
code_name: commonLogic.appcommonhandle("代码名称",null), code_name: commonLogic.appcommonhandle("代码名称",null),
entity_id: commonLogic.appcommonhandle("实体标识",null), entity_id: commonLogic.appcommonhandle("实体标识",null),
entity_name: commonLogic.appcommonhandle("实体名称",null), entity_name: commonLogic.appcommonhandle("实体名称",null),
entity_code_name: commonLogic.appcommonhandle("实体代码名称",null),
nested_name: commonLogic.appcommonhandle("嵌套代码名称",null),
ref_entity_id: commonLogic.appcommonhandle("引用实体标识",null), ref_entity_id: commonLogic.appcommonhandle("引用实体标识",null),
ref_entity_name: commonLogic.appcommonhandle("引用实体名称",null), ref_entity_name: commonLogic.appcommonhandle("引用实体名称",null),
nested_name: commonLogic.appcommonhandle("嵌套代码名称",null), ref_entity_code_name: commonLogic.appcommonhandle("引用实体代码名称",null),
system_id: commonLogic.appcommonhandle("系统",null),
lookup: commonLogic.appcommonhandle("Lookup",null), lookup: commonLogic.appcommonhandle("Lookup",null),
system_id: commonLogic.appcommonhandle("系统",null),
createdate: commonLogic.appcommonhandle("创建时间",null), createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null), updatedate: commonLogic.appcommonhandle("最后修改时间",null),
}, },
......
app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_en_US_base.ts
浏览文件 @ f6266e27
...@@ -9,11 +9,13 @@ function getLocaleResourceBase(){ ...@@ -9,11 +9,13 @@ function getLocaleResourceBase(){
code_name: commonLogic.appcommonhandle("代码名称",null), code_name: commonLogic.appcommonhandle("代码名称",null),
entity_id: commonLogic.appcommonhandle("实体标识",null), entity_id: commonLogic.appcommonhandle("实体标识",null),
entity_name: commonLogic.appcommonhandle("实体名称",null), entity_name: commonLogic.appcommonhandle("实体名称",null),
entity_code_name: commonLogic.appcommonhandle("实体代码名称",null),
nested_name: commonLogic.appcommonhandle("嵌套代码名称",null),
ref_entity_id: commonLogic.appcommonhandle("引用实体标识",null), ref_entity_id: commonLogic.appcommonhandle("引用实体标识",null),
ref_entity_name: commonLogic.appcommonhandle("引用实体名称",null), ref_entity_name: commonLogic.appcommonhandle("引用实体名称",null),
nested_name: commonLogic.appcommonhandle("嵌套代码名称",null), ref_entity_code_name: commonLogic.appcommonhandle("引用实体代码名称",null),
system_id: commonLogic.appcommonhandle("系统",null),
lookup: commonLogic.appcommonhandle("Lookup",null), lookup: commonLogic.appcommonhandle("Lookup",null),
system_id: commonLogic.appcommonhandle("系统",null),
createdate: commonLogic.appcommonhandle("创建时间",null), createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null), updatedate: commonLogic.appcommonhandle("最后修改时间",null),
}, },
......
app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_zh_CN_base.ts
浏览文件 @ f6266e27
...@@ -9,11 +9,13 @@ function getLocaleResourceBase(){ ...@@ -9,11 +9,13 @@ function getLocaleResourceBase(){
code_name: commonLogic.appcommonhandle("代码名称",null), code_name: commonLogic.appcommonhandle("代码名称",null),
entity_id: commonLogic.appcommonhandle("实体标识",null), entity_id: commonLogic.appcommonhandle("实体标识",null),
entity_name: commonLogic.appcommonhandle("实体名称",null), entity_name: commonLogic.appcommonhandle("实体名称",null),
entity_code_name: commonLogic.appcommonhandle("实体代码名称",null),
nested_name: commonLogic.appcommonhandle("嵌套代码名称",null),
ref_entity_id: commonLogic.appcommonhandle("引用实体标识",null), ref_entity_id: commonLogic.appcommonhandle("引用实体标识",null),
ref_entity_name: commonLogic.appcommonhandle("引用实体名称",null), ref_entity_name: commonLogic.appcommonhandle("引用实体名称",null),
nested_name: commonLogic.appcommonhandle("嵌套代码名称",null), ref_entity_code_name: commonLogic.appcommonhandle("引用实体代码名称",null),
system_id: commonLogic.appcommonhandle("系统",null),
lookup: commonLogic.appcommonhandle("Lookup",null), lookup: commonLogic.appcommonhandle("Lookup",null),
system_id: commonLogic.appcommonhandle("系统",null),
createdate: commonLogic.appcommonhandle("创建时间",null), createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null), updatedate: commonLogic.appcommonhandle("最后修改时间",null),
}, },
......
app_web/src/widgets/meta-relationship/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ f6266e27
...@@ -33,6 +33,12 @@ export default class PickupViewpickupviewpanelModel { ...@@ -33,6 +33,12 @@ export default class PickupViewpickupviewpanelModel {
{ {
name: 'entity_name', name: 'entity_name',
}, },
{
name: 'entity_code_name',
},
{
name: 'nested_name',
},
{ {
name: 'ref_entity_id', name: 'ref_entity_id',
}, },
...@@ -40,13 +46,13 @@ export default class PickupViewpickupviewpanelModel { ...@@ -40,13 +46,13 @@ export default class PickupViewpickupviewpanelModel {
name: 'ref_entity_name', name: 'ref_entity_name',
}, },
{ {
name: 'nested_name', name: 'ref_entity_code_name',
}, },
{ {
name: 'system_id', name: 'lookup',
}, },
{ {
name: 'lookup', name: 'system_id',
}, },
{ {
name: 'createdate', name: 'createdate',
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/domain/MetaRelationship.java
浏览文件 @ f6266e27
...@@ -97,6 +97,22 @@ public class MetaRelationship extends EntityMP implements Serializable { ...@@ -97,6 +97,22 @@ public class MetaRelationship extends EntityMP implements Serializable {
@JsonProperty("entity_name") @JsonProperty("entity_name")
@ApiModelProperty("实体名称") @ApiModelProperty("实体名称")
private String entityName; private String entityName;
/**
* 实体代码名称
*/
@TableField(exist = false)
@JSONField(name = "entity_code_name")
@JsonProperty("entity_code_name")
@ApiModelProperty("实体代码名称")
private String entityCodeName;
/**
* 嵌套代码名称
*/
@TableField(value = "nestedname")
@JSONField(name = "nested_name")
@JsonProperty("nested_name")
@ApiModelProperty("嵌套代码名称")
private String nestedName;
/** /**
* 引用实体标识 * 引用实体标识
*/ */
...@@ -114,13 +130,13 @@ public class MetaRelationship extends EntityMP implements Serializable { ...@@ -114,13 +130,13 @@ public class MetaRelationship extends EntityMP implements Serializable {
@ApiModelProperty("引用实体名称") @ApiModelProperty("引用实体名称")
private String refEntityName; private String refEntityName;
/** /**
* 嵌套代码名称 * 引用实体代码名称
*/ */
@TableField(value = "nestedname") @TableField(exist = false)
@JSONField(name = "nested_name") @JSONField(name = "ref_entity_code_name")
@JsonProperty("nested_name") @JsonProperty("ref_entity_code_name")
@ApiModelProperty("嵌套代码名称") @ApiModelProperty("引用实体代码名称")
private String nestedName; private String refEntityCodeName;
/** /**
* 系统 * 系统
*/ */
...@@ -223,6 +239,14 @@ public class MetaRelationship extends EntityMP implements Serializable { ...@@ -223,6 +239,14 @@ public class MetaRelationship extends EntityMP implements Serializable {
this.modify("entityname", entityName); this.modify("entityname", entityName);
} }
/**
* 设置 [嵌套代码名称]
*/
public void setNestedName(String nestedName) {
this.nestedName = nestedName;
this.modify("nestedname", nestedName);
}
/** /**
* 设置 [引用实体标识] * 设置 [引用实体标识]
*/ */
...@@ -239,14 +263,6 @@ public class MetaRelationship extends EntityMP implements Serializable { ...@@ -239,14 +263,6 @@ public class MetaRelationship extends EntityMP implements Serializable {
this.modify("refentityname", refEntityName); this.modify("refentityname", refEntityName);
} }
/**
* 设置 [嵌套代码名称]
*/
public void setNestedName(String nestedName) {
this.nestedName = nestedName;
this.modify("nestedname", nestedName);
}
/** /**
* 获取 [关系标识] * 获取 [关系标识]
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/filter/MetaRelationshipSearchContext.java
浏览文件 @ f6266e27
...@@ -54,6 +54,13 @@ public class MetaRelationshipSearchContext extends QueryWrapperContext<MetaRelat ...@@ -54,6 +54,13 @@ public class MetaRelationshipSearchContext extends QueryWrapperContext<MetaRelat
if(!ObjectUtils.isEmpty(this.n_entityname_like)){ if(!ObjectUtils.isEmpty(this.n_entityname_like)){
this.getSearchCond().like("entityname", n_entityname_like); this.getSearchCond().like("entityname", n_entityname_like);
} }
}
private String n_nestedname_like;//[嵌套代码名称]
public void setN_nestedname_like(String n_nestedname_like) {
this.n_nestedname_like = n_nestedname_like;
if(!ObjectUtils.isEmpty(this.n_nestedname_like)){
this.getSearchCond().like("nestedname", n_nestedname_like);
}
} }
private String n_refentityid_eq;//[引用实体标识] private String n_refentityid_eq;//[引用实体标识]
public void setN_refentityid_eq(String n_refentityid_eq) { public void setN_refentityid_eq(String n_refentityid_eq) {
...@@ -75,13 +82,6 @@ public class MetaRelationshipSearchContext extends QueryWrapperContext<MetaRelat ...@@ -75,13 +82,6 @@ public class MetaRelationshipSearchContext extends QueryWrapperContext<MetaRelat
if(!ObjectUtils.isEmpty(this.n_refentityname_like)){ if(!ObjectUtils.isEmpty(this.n_refentityname_like)){
this.getSearchCond().like("refentityname", n_refentityname_like); this.getSearchCond().like("refentityname", n_refentityname_like);
} }
}
private String n_nestedname_like;//[嵌套代码名称]
public void setN_nestedname_like(String n_nestedname_like) {
this.n_nestedname_like = n_nestedname_like;
if(!ObjectUtils.isEmpty(this.n_nestedname_like)){
this.getSearchCond().like("nestedname", n_nestedname_like);
}
} }
private String n_systemid_eq;//[系统] private String n_systemid_eq;//[系统]
public void setN_systemid_eq(String n_systemid_eq) { public void setN_systemid_eq(String n_systemid_eq) {
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaRelationshipServiceImpl.java
浏览文件 @ f6266e27
...@@ -296,6 +296,7 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap ...@@ -296,6 +296,7 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
entity=majorEntity; entity=majorEntity;
} }
et.setEntityName(entity.getEntityName()); et.setEntityName(entity.getEntityName());
et.setEntityCodeName(entity.getCodeName());
et.setSystemId(entity.getSystemId()); et.setSystemId(entity.getSystemId());
} }
//实体关系[DER1N_META_RELATION_META_ENTITY_REFENTITYID] //实体关系[DER1N_META_RELATION_META_ENTITY_REFENTITYID]
...@@ -307,6 +308,7 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap ...@@ -307,6 +308,7 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
reference=majorEntity; reference=majorEntity;
} }
et.setRefEntityName(reference.getEntityName()); et.setRefEntityName(reference.getEntityName());
et.setRefEntityCodeName(reference.getCodeName());
} }
} }
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ f6266e27
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 --> <!--输出实体[DA_BUILD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_build-2-1"> <changeSet author="root" id="tab-da_build-2-1">
<createTable tableName="IBZDABUILD"> <createTable tableName="IBZDABUILD">
<column name="BUILDID" remarks="" type="VARCHAR(100)"> <column name="BUILDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/> <constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<!--输出实体[DA_CHART]数据结构 --> <!--输出实体[DA_CHART]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_chart-1-2"> <changeSet author="root" id="tab-da_chart-1-2">
<createTable tableName="IBZDACHART"> <createTable tableName="IBZDACHART">
<column name="CHARTID" remarks="" type="VARCHAR(100)"> <column name="CHARTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_CHART_CHARTID"/> <constraints primaryKey="true" primaryKeyName="PK_DA_CHART_CHARTID"/>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<!--输出实体[DA_METRIC]数据结构 --> <!--输出实体[DA_METRIC]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_metric-1-3"> <changeSet author="root" id="tab-da_metric-1-3">
<createTable tableName="IBZDAMETRIC"> <createTable tableName="IBZDAMETRIC">
<column name="DA_METRICID" remarks="" type="VARCHAR(100)"> <column name="DA_METRICID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/> <constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<!--输出实体[DA_REPORT]数据结构 --> <!--输出实体[DA_REPORT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_report-12-4"> <changeSet author="root" id="tab-da_report-12-4">
<createTable tableName="IBZDAREPORT"> <createTable tableName="IBZDAREPORT">
<column name="REPORTID" remarks="" type="VARCHAR(100)"> <column name="REPORTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/> <constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<!--输出实体[DICT_CATALOG]数据结构 --> <!--输出实体[DICT_CATALOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_catalog-6-5"> <changeSet author="root" id="tab-dict_catalog-6-5">
<createTable tableName="IBZDICTCATALOG"> <createTable tableName="IBZDICTCATALOG">
<column name="CID" remarks="" type="VARCHAR(100)"> <column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/> <constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<!--输出实体[DICT_OPTION]数据结构 --> <!--输出实体[DICT_OPTION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_option-5-6"> <changeSet author="root" id="tab-dict_option-5-6">
<createTable tableName="IBZDICTOPTION"> <createTable tableName="IBZDICTOPTION">
<column name="VKEY" remarks="" type="VARCHAR(100)"> <column name="VKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/> <constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 --> <!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-7-7"> <changeSet author="root" id="tab-dst_datasource-7-7">
<createTable tableName="IBZDATASOURCE"> <createTable tableName="IBZDATASOURCE">
<column name="DSID" remarks="" type="VARCHAR(100)"> <column name="DSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/> <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<!--输出实体[DST_SYSTEM]数据结构 --> <!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_system-1-8"> <changeSet author="root" id="tab-dst_system-1-8">
<createTable tableName="IBZPSSYSTEM"> <createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)"> <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/> <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<!--输出实体[RU_EXECLOG]数据结构 --> <!--输出实体[RU_EXECLOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_execlog-1-9"> <changeSet author="root" id="tab-ru_execlog-1-9">
<createTable tableName="IBZRULELOG"> <createTable tableName="IBZRULELOG">
<column name="RU_EXECLOGID" remarks="" type="VARCHAR(100)"> <column name="RU_EXECLOGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECLOG_RU_EXECLOGID"/> <constraints primaryKey="true" primaryKeyName="PK_RU_EXECLOG_RU_EXECLOGID"/>
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<!--输出实体[RU_EXECRESULT]数据结构 --> <!--输出实体[RU_EXECRESULT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_execresult-1-10"> <changeSet author="root" id="tab-ru_execresult-1-10">
<createTable tableName="IBZRULERESULT"> <createTable tableName="IBZRULERESULT">
<column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)"> <column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/> <constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/>
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
<!--输出实体[META_DATASET]数据结构 --> <!--输出实体[META_DATASET]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dataset-1-11"> <changeSet author="root" id="tab-meta_dataset-1-11">
<createTable tableName="IBZDATASET"> <createTable tableName="IBZDATASET">
<column name="DATASETID" remarks="" type="VARCHAR(100)"> <column name="DATASETID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/> <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
<!--输出实体[META_ENTITY]数据结构 --> <!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-5-12"> <changeSet author="root" id="tab-meta_entity-5-12">
<createTable tableName="IBZENTITY"> <createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)"> <column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/> <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
<!--输出实体[META_FIELD]数据结构 --> <!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-11-13"> <changeSet author="root" id="tab-meta_field-11-13">
<createTable tableName="IBZFIELD"> <createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)"> <column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/> <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
<!--输出实体[META_MODEL]数据结构 --> <!--输出实体[META_MODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_model-1-14"> <changeSet author="root" id="tab-meta_model-1-14">
<createTable tableName="IBZMODEL"> <createTable tableName="IBZMODEL">
<column name="MODELID" remarks="" type="VARCHAR(100)"> <column name="MODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/> <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
<!--输出实体[META_MODULE]数据结构 --> <!--输出实体[META_MODULE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_module-1-15"> <changeSet author="root" id="tab-meta_module-1-15">
<createTable tableName="IBZMODULE"> <createTable tableName="IBZMODULE">
<column name="MODULEID" remarks="" type="VARCHAR(100)"> <column name="MODULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/> <constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
...@@ -434,7 +434,7 @@ ...@@ -434,7 +434,7 @@
<!--输出实体[META_RELATION]数据结构 --> <!--输出实体[META_RELATION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-1-16"> <changeSet author="root" id="tab-meta_relation-1-16">
<createTable tableName="IBZRELATION"> <createTable tableName="IBZRELATION">
<column name="RELATIONID" remarks="" type="VARCHAR(100)"> <column name="RELATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/> <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
...@@ -449,12 +449,12 @@ ...@@ -449,12 +449,12 @@
</column> </column>
<column name="ENTITYNAME" remarks="" type="VARCHAR(100)"> <column name="ENTITYNAME" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="NESTEDNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="REFENTITYID" remarks="" type="VARCHAR(100)"> <column name="REFENTITYID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="REFENTITYNAME" remarks="" type="VARCHAR(100)"> <column name="REFENTITYNAME" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="NESTEDNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="LOOKUP" remarks="" type="TEXT(1000)"> <column name="LOOKUP" remarks="" type="TEXT(1000)">
</column> </column>
<column name="CREATEDATE" remarks="" type="DATETIME"> <column name="CREATEDATE" remarks="" type="DATETIME">
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
<!--输出实体[RU_ENGINE]数据结构 --> <!--输出实体[RU_ENGINE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_engine-1-17"> <changeSet author="root" id="tab-ru_engine-1-17">
<createTable tableName="IBZRULEENGINE"> <createTable tableName="IBZRULEENGINE">
<column name="ENGINEID" remarks="" type="VARCHAR(100)"> <column name="ENGINEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/> <constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
<!--输出实体[RU_ITEM]数据结构 --> <!--输出实体[RU_ITEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_item-1-18"> <changeSet author="root" id="tab-ru_item-1-18">
<createTable tableName="IBZRULE"> <createTable tableName="IBZRULE">
<column name="RULEID" remarks="" type="VARCHAR(100)"> <column name="RULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/> <constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
<!--输出实体[ETL_TABLE_SYNC]数据结构 --> <!--输出实体[ETL_TABLE_SYNC]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-etl_table_sync-81-19"> <changeSet author="root" id="tab-etl_table_sync-81-19">
<createTable tableName="IBZTABLESYNC"> <createTable tableName="IBZTABLESYNC">
<column name="SYNCID" remarks="" type="VARCHAR(100)"> <column name="SYNCID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_ETL_TABLE_SYNC_SYNCID"/> <constraints primaryKey="true" primaryKeyName="PK_ETL_TABLE_SYNC_SYNCID"/>
...@@ -585,13 +585,13 @@ ...@@ -585,13 +585,13 @@
<!--输出实体[DA_BUILD]外键关系 --> <!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 --> <!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[DA_METRIC]外键关系 --> <!--输出实体[DA_METRIC]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-da_metric-1-20"> <changeSet author="root" id="fk-da_metric-1-20">
<addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/> <addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[DA_REPORT]外键关系 --> <!--输出实体[DA_REPORT]外键关系 -->
<!--输出实体[DICT_CATALOG]外键关系 --> <!--输出实体[DICT_CATALOG]外键关系 -->
<!--输出实体[DICT_OPTION]外键关系 --> <!--输出实体[DICT_OPTION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dict_option-5-21"> <changeSet author="root" id="fk-dict_option-5-21">
<addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/> <addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[DST_DATASOURCE]外键关系 --> <!--输出实体[DST_DATASOURCE]外键关系 -->
......
ibzdst-core/src/main/resources/mapper/lite/metarelationship/MetaRelationshipMapper.xml
浏览文件 @ f6266e27
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`LOOKUP`, t1.`NESTEDNAME`, t1.`REFENTITYID`, t1.`REFENTITYNAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`RELTYPE`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRELATION` t1 LEFT JOIN `IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID` ) t1 where relationid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`LOOKUP`, t1.`NESTEDNAME`, t1.`REFENTITYID`, t1.`REFENTITYNAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`RELTYPE`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRELATION` t1 LEFT JOIN `IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID` ) t1 where relationid=#{id}]]>
</select> </select>
<select id="selectById" resultMap="MetaRelationshipResultMap" databaseId="oracle"> <select id="selectById" resultMap="MetaRelationshipResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t1.ENTITYID, t1.ENTITYNAME, t1.LOOKUP, t1.NESTEDNAME, t1.REFENTITYID, t1.REFENTITYNAME, t1.RELATIONID, t1.RELATIONNAME, t1.RELTYPE, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRELATION t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID ) t1 where relationid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.LOOKUP, t1.NESTEDNAME, t21.CODENAME AS REFENTITYCODENAME, t1.REFENTITYID, t1.REFENTITYNAME, t1.RELATIONID, t1.RELATIONNAME, t1.RELTYPE, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRELATION t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZENTITY t21 ON t1.REFENTITYID = t21.ENTITYID ) t1 where relationid=#{id}]]>
</select> </select>
<select id="selectById" resultMap="MetaRelationshipResultMap" databaseId="postgresql"> <select id="selectById" resultMap="MetaRelationshipResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t1.ENTITYID, t1.ENTITYNAME, t1.LOOKUP, t1.NESTEDNAME, t1.REFENTITYID, t1.REFENTITYNAME, t1.RELATIONID, t1.RELATIONNAME, t1.RELTYPE, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRELATION t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID ) t1 where relationid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t1.ENTITYID, t1.ENTITYNAME, t1.LOOKUP, t1.NESTEDNAME, t1.REFENTITYID, t1.REFENTITYNAME, t1.RELATIONID, t1.RELATIONNAME, t1.RELTYPE, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRELATION t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID ) t1 where relationid=#{id}]]>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</sql> </sql>
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="oracle"> <sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.CREATEDATE, t1.ENTITYID, t1.ENTITYNAME, t1.NESTEDNAME, t1.REFENTITYID, t1.REFENTITYNAME, t1.RELATIONID, t1.RELATIONNAME, t1.RELTYPE, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRELATION t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID <![CDATA[ SELECT t1.CODENAME, t1.CREATEDATE, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.NESTEDNAME, t21.CODENAME AS REFENTITYCODENAME, t1.REFENTITYID, t1.REFENTITYNAME, t1.RELATIONID, t1.RELATIONNAME, t1.RELTYPE, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRELATION t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZENTITY t21 ON t1.REFENTITYID = t21.ENTITYID
]]> ]]>
</sql> </sql>
<!--数据查询[Default]--> <!--数据查询[Default]-->
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="oracle"> <sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.CREATEDATE, t1.ENTITYID, t1.ENTITYNAME, t1.LOOKUP, t1.NESTEDNAME, t1.REFENTITYID, t1.REFENTITYNAME, t1.RELATIONID, t1.RELATIONNAME, t1.RELTYPE, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRELATION t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID <![CDATA[ SELECT t1.CODENAME, t1.CREATEDATE, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.LOOKUP, t1.NESTEDNAME, t21.CODENAME AS REFENTITYCODENAME, t1.REFENTITYID, t1.REFENTITYNAME, t1.RELATIONID, t1.RELATIONNAME, t1.RELTYPE, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRELATION t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZENTITY t21 ON t1.REFENTITYID = t21.ENTITYID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
......
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @ f6266e27
...@@ -3388,6 +3388,38 @@ ...@@ -3388,6 +3388,38 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"ENTITYCODENAME" ,
"codename":"Entity_code_name",
"field_logic_name":"实体代码名称",
"entity_name":"META_RELATION",
"ref_de":"META_ENTITY",
"ref_field_name":"CODENAME",
"relation_name":"DER1N_META_RELATION_META_ENTITY_ENTITYID",
"relation_codename":"Entity",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":7,
"major_field":0
},
{
"fieldname":"NESTEDNAME" ,
"codename":"Nested_name",
"field_logic_name":"嵌套代码名称",
"entity_name":"META_RELATION",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":10,
"major_field":0
},
{
"fieldname":"REFENTITYID" , "fieldname":"REFENTITYID" ,
"codename":"Ref_entity_id", "codename":"Ref_entity_id",
"field_logic_name":"引用实体标识", "field_logic_name":"引用实体标识",
...@@ -3403,7 +3435,7 @@ ...@@ -3403,7 +3435,7 @@
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"union_key":"KEY2", "union_key":"KEY2",
"show_order":7, "show_order":11,
"major_field":0 "major_field":0
}, },
{ {
...@@ -3421,21 +3453,39 @@ ...@@ -3421,21 +3453,39 @@
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":8, "show_order":12,
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"NESTEDNAME" , "fieldname":"REFENTITYCODENAME" ,
"codename":"Nested_name", "codename":"Ref_entity_code_name",
"field_logic_name":"嵌套代码名称", "field_logic_name":"引用实体代码名称",
"entity_name":"META_RELATION", "entity_name":"META_RELATION",
"field_type":"TEXT", "ref_de":"META_ENTITY",
"ref_field_name":"CODENAME",
"relation_name":"DER1N_META_RELATION_META_ENTITY_REFENTITYID",
"relation_codename":"Reference",
"field_type":"PICKUPDATA",
"nullable":1, "nullable":1,
"physical_field":1, "physical_field":0,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":9, "show_order":13,
"major_field":0
},
{
"fieldname":"LOOKUP" ,
"codename":"Lookup",
"field_logic_name":"Lookup",
"entity_name":"META_RELATION",
"field_type":"ONE2MANYDATA",
"nullable":1,
"physical_field":1,
"data_type":"TEXT",
"data_length":1000,
"key_field":0,
"show_order":17,
"major_field":0 "major_field":0
}, },
{ {
...@@ -3453,21 +3503,7 @@ ...@@ -3453,21 +3503,7 @@
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":10, "show_order":18,
"major_field":0
},
{
"fieldname":"LOOKUP" ,
"codename":"Lookup",
"field_logic_name":"Lookup",
"entity_name":"META_RELATION",
"field_type":"ONE2MANYDATA",
"nullable":1,
"physical_field":1,
"data_type":"TEXT",
"data_length":1000,
"key_field":0,
"show_order":11,
"major_field":0 "major_field":0
}, },
{ {
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/MetaRelationshipDTO.java
浏览文件 @ f6266e27
...@@ -93,6 +93,26 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable { ...@@ -93,6 +93,26 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable {
@ApiModelProperty("实体名称") @ApiModelProperty("实体名称")
private String entityName; private String entityName;
/**
* 属性 [ENTITYCODENAME]
*
*/
@JSONField(name = "entity_code_name")
@JsonProperty("entity_code_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("实体代码名称")
private String entityCodeName;
/**
* 属性 [NESTEDNAME]
*
*/
@JSONField(name = "nested_name")
@JsonProperty("nested_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("嵌套代码名称")
private String nestedName;
/** /**
* 属性 [REFENTITYID] * 属性 [REFENTITYID]
* *
...@@ -114,14 +134,14 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable { ...@@ -114,14 +134,14 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable {
private String refEntityName; private String refEntityName;
/** /**
* 属性 [NESTEDNAME] * 属性 [REFENTITYCODENAME]
* *
*/ */
@JSONField(name = "nested_name") @JSONField(name = "ref_entity_code_name")
@JsonProperty("nested_name") @JsonProperty("ref_entity_code_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("嵌套代码名称") @ApiModelProperty("引用实体代码名称")
private String nestedName; private String refEntityCodeName;
/** /**
* 属性 [SYSTEMID] * 属性 [SYSTEMID]
...@@ -194,6 +214,14 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable { ...@@ -194,6 +214,14 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable {
this.modify("entityname",entityName); this.modify("entityname",entityName);
} }
/**
* 设置 [NESTEDNAME]
*/
public void setNestedName(String nestedName){
this.nestedName = nestedName ;
this.modify("nestedname",nestedName);
}
/** /**
* 设置 [REFENTITYID] * 设置 [REFENTITYID]
*/ */
...@@ -210,14 +238,6 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable { ...@@ -210,14 +238,6 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable {
this.modify("refentityname",refEntityName); this.modify("refentityname",refEntityName);
} }
/**
* 设置 [NESTEDNAME]
*/
public void setNestedName(String nestedName){
this.nestedName = nestedName ;
this.modify("nestedname",nestedName);
}
/** /**
* [META_LOOKUP] * [META_LOOKUP]
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或