Skip to content

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

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

上级 acd993cd
显示空白字符变更
内嵌 并排
正在显示 包含 85 行增加 和 25 行删除
app_web/src/locale/lanres/entities/table-sync/table-sync_BO_CN_base.ts
浏览文件 @ 390c4003
......@@ -8,6 +8,7 @@ function getLocaleResourceBase(){
source_entity_id: commonLogic.appcommonhandle("源实体标识",null),
source_entity_name: commonLogic.appcommonhandle("源实体名称",null),
source_ds_id: commonLogic.appcommonhandle("源实体数据源",null),
source_system_id: commonLogic.appcommonhandle("源实体系统标识",null),
source_expression: commonLogic.appcommonhandle("源数据表达式",null),
entity_id: commonLogic.appcommonhandle("目标实体标识",null),
entity_name: commonLogic.appcommonhandle("目标实体",null),
......
app_web/src/locale/lanres/entities/table-sync/table-sync_en_US_base.ts
浏览文件 @ 390c4003
......@@ -8,6 +8,7 @@ function getLocaleResourceBase(){
source_entity_id: commonLogic.appcommonhandle("源实体标识",null),
source_entity_name: commonLogic.appcommonhandle("源实体名称",null),
source_ds_id: commonLogic.appcommonhandle("源实体数据源",null),
source_system_id: commonLogic.appcommonhandle("源实体系统标识",null),
source_expression: commonLogic.appcommonhandle("源数据表达式",null),
entity_id: commonLogic.appcommonhandle("目标实体标识",null),
entity_name: commonLogic.appcommonhandle("目标实体",null),
......
app_web/src/locale/lanres/entities/table-sync/table-sync_zh_CN_base.ts
浏览文件 @ 390c4003
......@@ -8,6 +8,7 @@ function getLocaleResourceBase(){
source_entity_id: commonLogic.appcommonhandle("源实体标识",null),
source_entity_name: commonLogic.appcommonhandle("源实体名称",null),
source_ds_id: commonLogic.appcommonhandle("源实体数据源",null),
source_system_id: commonLogic.appcommonhandle("源实体系统标识",null),
source_expression: commonLogic.appcommonhandle("源数据表达式",null),
entity_id: commonLogic.appcommonhandle("目标实体标识",null),
entity_name: commonLogic.appcommonhandle("目标实体",null),
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/domain/TableSync.java
浏览文件 @ 390c4003
......@@ -91,6 +91,15 @@ public class TableSync extends EntityMP implements Serializable {
@JsonProperty("source_ds_id")
@ApiModelProperty("源实体数据源")
private String sourceDsId;
/**
* 源实体系统标识
*/
@DEField(name = "srcsystemid")
@TableField(value = "srcsystemid")
@JSONField(name = "source_system_id")
@JsonProperty("source_system_id")
@ApiModelProperty("源实体系统标识")
private String sourceSystemId;
/**
* 源数据表达式
*/
......@@ -287,6 +296,14 @@ public class TableSync extends EntityMP implements Serializable {
this.modify("srcdsid", sourceDsId);
}
/**
* 设置 [源实体系统标识]
*/
public void setSourceSystemId(String sourceSystemId) {
this.sourceSystemId = sourceSystemId;
this.modify("srcsystemid", sourceSystemId);
}
/**
* 设置 [源数据表达式]
*/
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/TableSyncServiceImpl.java
浏览文件 @ 390c4003
......@@ -260,6 +260,7 @@ public class TableSyncServiceImpl extends ServiceImpl<TableSyncMapper, TableSync
sourceentity=majorEntity;
}
et.setSourceEntityName(sourceentity.getEntityName());
et.setSourceSystemId(sourceentity.getSystemId());
}
}
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 390c4003
......@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_build-1-1">
<changeSet author="root" id="tab-da_build-1-1">
<createTable tableName="IBZDABUILD">
<column name="BUILDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
......@@ -32,7 +32,7 @@
<!--输出实体[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">
<column name="CHARTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_CHART_CHARTID"/>
......@@ -54,7 +54,7 @@
<!--输出实体[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">
<column name="DA_METRICID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
......@@ -82,7 +82,7 @@
<!--输出实体[DA_REPORT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_report-1-4">
<changeSet author="root" id="tab-da_report-1-4">
<createTable tableName="IBZDAREPORT">
<column name="REPORTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/>
......@@ -102,7 +102,7 @@
<!--输出实体[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">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/>
......@@ -126,7 +126,7 @@
<!--输出实体[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">
<column name="VKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
......@@ -166,7 +166,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-1-7">
<changeSet author="root" id="tab-dst_datasource-1-7">
<createTable tableName="IBZDATASOURCE">
<column name="DSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
......@@ -182,7 +182,7 @@
<!--输出实体[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">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
......@@ -202,7 +202,7 @@
<!--输出实体[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">
<column name="RU_EXECLOGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECLOG_RU_EXECLOGID"/>
......@@ -232,7 +232,7 @@
<!--输出实体[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">
<column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/>
......@@ -272,7 +272,7 @@
<!--输出实体[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">
<column name="DATASETID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
......@@ -294,7 +294,7 @@
<!--输出实体[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">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
......@@ -326,7 +326,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-1-13">
<changeSet author="root" id="tab-meta_field-1-13">
<createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......@@ -390,7 +390,7 @@
<!--输出实体[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">
<column name="MODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
......@@ -416,7 +416,7 @@
<!--输出实体[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">
<column name="MODULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
......@@ -434,7 +434,7 @@
<!--输出实体[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">
<column name="RELATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
......@@ -466,7 +466,7 @@
<!--输出实体[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">
<column name="ENGINEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
......@@ -494,7 +494,7 @@
<!--输出实体[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">
<column name="RULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
......@@ -530,7 +530,7 @@
<!--输出实体[ETL_TABLE_SYNC]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-etl_table_sync-61-19">
<changeSet author="root" id="tab-etl_table_sync-68-19">
<createTable tableName="IBZTABLESYNC">
<column name="SYNCID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_ETL_TABLE_SYNC_SYNCID"/>
......@@ -543,6 +543,8 @@
</column>
<column name="SRCDSID" remarks="" type="VARCHAR(100)">
</column>
<column name="SRCSYSTEMID" remarks="" type="VARCHAR(100)">
</column>
<column name="SRCEXP" remarks="" type="TEXT(1048576)">
</column>
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
......@@ -583,13 +585,13 @@
<!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[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"/>
</changeSet>
<!--输出实体[DA_REPORT]外键关系 -->
<!--输出实体[DICT_CATALOG]外键关系 -->
<!--输出实体[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"/>
</changeSet>
<!--输出实体[DST_DATASOURCE]外键关系 -->
......
ibzdst-core/src/main/resources/mapper/lite/tablesync/TableSyncMapper.xml
浏览文件 @ 390c4003
......@@ -15,6 +15,7 @@
<result property="sourceEntityId" column="srcentityid" />
<result property="sourceEntityName" column="srcentityname" />
<result property="sourceDsId" column="srcdsid" />
<result property="sourceSystemId" column="srcsystemid" />
<result property="sourceExpression" column="srcexp" />
<result property="entityId" column="entityid" />
<result property="mappingConfig" column="mappingcfg" />
......
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @ 390c4003
......@@ -3974,7 +3974,7 @@
"data_type":"VARCHAR",
"data_length":100,
"key_field":1,
"show_order":1,
"show_order":0,
"major_field":0
},
{
......@@ -3988,7 +3988,7 @@
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":2,
"show_order":1,
"major_field":1
},
{
......@@ -4006,7 +4006,7 @@
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":3,
"show_order":2,
"major_field":0
},
{
......@@ -4024,7 +4024,7 @@
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":4,
"show_order":3,
"major_field":0
},
{
......@@ -4038,6 +4038,24 @@
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":4,
"major_field":0
},
{
"fieldname":"SRCSYSTEMID" ,
"codename":"Source_system_id",
"field_logic_name":"源实体系统标识",
"entity_name":"ETL_TABLE_SYNC",
"ref_de":"META_ENTITY",
"ref_field_name":"SYSTEMID",
"relation_name":"DER1N_ETL_TABLE_SYNC_META_ENTITY_SRCENTITYID",
"relation_codename":"SourceEntity",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":5,
"major_field":0
},
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/TableSyncDTO.java
浏览文件 @ 390c4003
......@@ -82,6 +82,16 @@ public class TableSyncDTO extends DTOBase implements Serializable {
@ApiModelProperty("源实体数据源")
private String sourceDsId;
/**
* 属性 [SRCSYSTEMID]
*
*/
@JSONField(name = "source_system_id")
@JsonProperty("source_system_id")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("源实体系统标识")
private String sourceSystemId;
/**
* 属性 [SRCEXP]
*
......@@ -283,6 +293,14 @@ public class TableSyncDTO extends DTOBase implements Serializable {
this.modify("srcdsid",sourceDsId);
}
/**
* 设置 [SRCSYSTEMID]
*/
public void setSourceSystemId(String sourceSystemId){
this.sourceSystemId = sourceSystemId ;
this.modify("srcsystemid",sourceSystemId);
}
/**
* 设置 [SRCEXP]
*/
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或