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

app_web/public/assets/json/data-dictionary.json

@@ -7,6 +7,14 @@
         "appdedataset":"FetchDefault",
         "items": []
     }, 
+    {
+        "srfkey": "DstDataSourceList",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DstDataSource",
+        "appdedataset":"FetchDefault",
+        "items": []
+    }, 
     {
         "srfkey": "OPCond",
         "emptytext": "未定义",
@@ -242,6 +250,14 @@
         "appdedataset":"FetchDefault",
         "items": []
     }, 
+    {
+        "srfkey": "DstSystemList",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DstSystem",
+        "appdedataset":"FetchDefault",
+        "items": []
+    }, 
     {
         "srfkey": "CLMetricType",
         "emptytext": "未定义",

app_web/src/codelist/codelist-register.ts

@@ -40,7 +40,9 @@ export class CodeListRegister {
      */
     protected init(): void {
             this.allCodeList.set('CLMetric', () => import('@/codelist/clmetric'));
+        this.allCodeList.set('DstDataSourceList', () => import('@/codelist/dst-data-source-list'));
         this.allCodeList.set('CLModel', () => import('@/codelist/clmodel'));
+        this.allCodeList.set('DstSystemList', () => import('@/codelist/dst-system-list'));
         this.allCodeList.set('CLRuleGroup', () => import('@/codelist/clrule-group'));
     }
 

app_web/src/codelist/dst-data-source-list.ts

+import DstDataSourceService from '@service/dst-data-source/dst-data-source-service';
+/**
+ * 代码表--DstDataSourceList
+ *
+ * @export
+ * @class DstDataSourceList
+ */
+export default class DstDataSourceList {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof DstDataSourceList
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof DstDataSourceList
+     */
+    public static expirationTime:any;
+
+    /**
+     * 预定义类型
+     *
+     * @type string
+     * @memberof DstDataSourceList
+     */
+    public predefinedType:string ='';
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof DstDataSourceList
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof DstDataSourceList
+     */
+    public codelistModel:any = {
+        codelistid:"DstDataSourceList"
+    };
+
+    /**
+     * 获取过期时间
+     *
+     * @type any
+     * @memberof DstDataSourceList
+     */
+    public getExpirationTime(){
+        return DstDataSourceList.expirationTime;
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @type any
+     * @memberof DstDataSourceList
+     */
+    public setExpirationTime(value:any){
+        DstDataSourceList.expirationTime = value; 
+    }
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof DstDataSourceList
+     */
+    public userParamNames:any ={
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof DstDataSourceList
+     */
+    public queryParamNames:any ={
+    }
+
+    /**
+     * 数据源应用实体服务对象
+     *
+     * @type {DstDataSourceService}
+     * @memberof DstDataSourceList
+     */
+    public dstdatasourceService: DstDataSourceService = new DstDataSourceService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof DstDataSourceList
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        if(items && items instanceof Array && items.length >0){
+            items.forEach((item: any) => {
+                let itemdata:any = {};
+                Object.assign(itemdata,{id:item.ds_id});
+                Object.assign(itemdata,{value:item.ds_id});
+                Object.assign(itemdata,{text:item.ds_name});
+                Object.assign(itemdata,{label:item.ds_name});
+                
+                
+                
+                
+                _items.push(itemdata);
+            });
+        }
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DstDataSourceList
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.dstdatasourceService.FetchDefault(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof DstDataSourceList
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_web/src/codelist/dst-system-list.ts

+import DstSystemService from '@service/dst-system/dst-system-service';
+/**
+ * 代码表--DstSystemList
+ *
+ * @export
+ * @class DstSystemList
+ */
+export default class DstSystemList {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof DstSystemList
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public static expirationTime:any;
+
+    /**
+     * 预定义类型
+     *
+     * @type string
+     * @memberof DstSystemList
+     */
+    public predefinedType:string ='';
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public codelistModel:any = {
+        codelistid:"DstSystemList"
+    };
+
+    /**
+     * 获取过期时间
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public getExpirationTime(){
+        return DstSystemList.expirationTime;
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public setExpirationTime(value:any){
+        DstSystemList.expirationTime = value; 
+    }
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public userParamNames:any ={
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof DstSystemList
+     */
+    public queryParamNames:any ={
+    }
+
+    /**
+     * 系统应用实体服务对象
+     *
+     * @type {DstSystemService}
+     * @memberof DstSystemList
+     */
+    public dstsystemService: DstSystemService = new DstSystemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof DstSystemList
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        if(items && items instanceof Array && items.length >0){
+            items.forEach((item: any) => {
+                let itemdata:any = {};
+                Object.assign(itemdata,{id:item.pssystemid});
+                Object.assign(itemdata,{value:item.pssystemid});
+                Object.assign(itemdata,{text:item.pssystemname});
+                Object.assign(itemdata,{label:item.pssystemname});
+                
+                
+                
+                
+                _items.push(itemdata);
+            });
+        }
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DstSystemList
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.dstsystemService.FetchDefault(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof DstSystemList
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_web/src/locale/lanres/codelist/codelist_BO_CN_base.ts

@@ -5,6 +5,9 @@ function getLocaleResourceBase(){
       CLMetric: {
           "empty": commonLogic.appcommonhandle("",null),
       },
+      DstDataSourceList: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
       OPCond: {
           "EQ": commonLogic.appcommonhandle("等于",null),
           "NOTEQ": commonLogic.appcommonhandle("不等于",null),
@@ -31,6 +34,9 @@ function getLocaleResourceBase(){
       CLModel: {
           "empty": commonLogic.appcommonhandle("",null),
       },
+      DstSystemList: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
       CLMetricType: {
           "COUNT": commonLogic.appcommonhandle("COUNT",null),
           "COUNT_DISTINCT": commonLogic.appcommonhandle("COUNT_DISTINCT",null),

app_web/src/locale/lanres/codelist/codelist_en_US_base.ts

@@ -5,6 +5,9 @@ function getLocaleResourceBase(){
       CLMetric: {
           "empty": commonLogic.appcommonhandle("",null),
       },
+      DstDataSourceList: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
       OPCond: {
           "EQ": commonLogic.appcommonhandle("等于",null),
           "NOTEQ": commonLogic.appcommonhandle("不等于",null),
@@ -31,6 +34,9 @@ function getLocaleResourceBase(){
       CLModel: {
           "empty": commonLogic.appcommonhandle("",null),
       },
+      DstSystemList: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
       CLMetricType: {
           "COUNT": commonLogic.appcommonhandle("COUNT",null),
           "COUNT_DISTINCT": commonLogic.appcommonhandle("COUNT_DISTINCT",null),

app_web/src/locale/lanres/codelist/codelist_zh_CN_base.ts

@@ -5,6 +5,9 @@ function getLocaleResourceBase(){
       CLMetric: {
           "empty": commonLogic.appcommonhandle("",null),
       },
+      DstDataSourceList: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
       OPCond: {
           "EQ": commonLogic.appcommonhandle("等于",null),
           "NOTEQ": commonLogic.appcommonhandle("不等于",null),
@@ -31,6 +34,9 @@ function getLocaleResourceBase(){
       CLModel: {
           "empty": commonLogic.appcommonhandle("",null),
       },
+      DstSystemList: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
       CLMetricType: {
           "COUNT": commonLogic.appcommonhandle("COUNT",null),
           "COUNT_DISTINCT": commonLogic.appcommonhandle("COUNT_DISTINCT",null),

app_web/src/locale/lanres/entities/table-sync/table-sync_BO_CN_base.ts

@@ -52,12 +52,13 @@ function getLocaleResourceBase(){
 				syncid: commonLogic.appcommonhandle("标识",null), 
 				syncname: commonLogic.appcommonhandle("标题",null), 
 				syncgroup: commonLogic.appcommonhandle("分组",null), 
-				systemid: commonLogic.appcommonhandle("系统标识",null), 
 				srcdsid: commonLogic.appcommonhandle("源实体数据源",null), 
+				srcsystemid: commonLogic.appcommonhandle("源系统",null), 
 				srcentityid: commonLogic.appcommonhandle("源实体标识",null), 
 				srcentityname: commonLogic.appcommonhandle("源实体名称",null), 
 				srcexp: commonLogic.appcommonhandle("源数据表达式",null), 
 				dsid: commonLogic.appcommonhandle("目标数据源",null), 
+				systemid: commonLogic.appcommonhandle("目标系统",null), 
 				entityid: commonLogic.appcommonhandle("目标实体标识",null), 
 				entityname: commonLogic.appcommonhandle("目标实体",null), 
 				mappingcfg: commonLogic.appcommonhandle("映射配置",null), 

app_web/src/locale/lanres/entities/table-sync/table-sync_en_US_base.ts

@@ -52,12 +52,13 @@ function getLocaleResourceBase(){
 				syncid: commonLogic.appcommonhandle("标识",null), 
 				syncname: commonLogic.appcommonhandle("标题",null), 
 				syncgroup: commonLogic.appcommonhandle("分组",null), 
-				systemid: commonLogic.appcommonhandle("系统标识",null), 
 				srcdsid: commonLogic.appcommonhandle("源实体数据源",null), 
+				srcsystemid: commonLogic.appcommonhandle("源系统",null), 
 				srcentityid: commonLogic.appcommonhandle("源实体标识",null), 
 				srcentityname: commonLogic.appcommonhandle("源实体名称",null), 
 				srcexp: commonLogic.appcommonhandle("源数据表达式",null), 
 				dsid: commonLogic.appcommonhandle("目标数据源",null), 
+				systemid: commonLogic.appcommonhandle("目标系统",null), 
 				entityid: commonLogic.appcommonhandle("目标实体标识",null), 
 				entityname: commonLogic.appcommonhandle("目标实体",null), 
 				mappingcfg: commonLogic.appcommonhandle("映射配置",null), 

app_web/src/locale/lanres/entities/table-sync/table-sync_zh_CN_base.ts

@@ -52,12 +52,13 @@ function getLocaleResourceBase(){
 				syncid: commonLogic.appcommonhandle("标识",null), 
 				syncname: commonLogic.appcommonhandle("标题",null), 
 				syncgroup: commonLogic.appcommonhandle("分组",null), 
-				systemid: commonLogic.appcommonhandle("系统标识",null), 
 				srcdsid: commonLogic.appcommonhandle("源实体数据源",null), 
+				srcsystemid: commonLogic.appcommonhandle("源系统",null), 
 				srcentityid: commonLogic.appcommonhandle("源实体标识",null), 
 				srcentityname: commonLogic.appcommonhandle("源实体名称",null), 
 				srcexp: commonLogic.appcommonhandle("源数据表达式",null), 
 				dsid: commonLogic.appcommonhandle("目标数据源",null), 
+				systemid: commonLogic.appcommonhandle("目标系统",null), 
 				entityid: commonLogic.appcommonhandle("目标实体标识",null), 
 				entityname: commonLogic.appcommonhandle("目标实体",null), 
 				mappingcfg: commonLogic.appcommonhandle("映射配置",null), 

app_web/src/mock/codelist/codelist.ts

@@ -15,6 +15,14 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
         "appdedataset":"FetchDefault",
         "items": []
     },
+    {
+        "srfkey": "DstDataSourceList",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DstDataSource",
+        "appdedataset":"FetchDefault",
+        "items": []
+    },
     {
         srfkey: "OPCond",
         emptytext: "未定义",
@@ -250,6 +258,14 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
         "appdedataset":"FetchDefault",
         "items": []
     },
+    {
+        "srfkey": "DstSystemList",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DstSystem",
+        "appdedataset":"FetchDefault",
+        "items": []
+    },
     {
         srfkey: "CLMetricType",
         emptytext: "未定义",

app_web/src/widgets/table-sync/main-form/main-form-model.ts

@@ -70,16 +70,16 @@ export default class MainModel {
         prop: 'group',
         dataType: 'TEXT',
       },
-      {
-        name: 'systemid',
-        prop: 'system_id',
-        dataType: 'PICKUPDATA',
-      },
       {
         name: 'srcdsid',
         prop: 'source_ds_id',
         dataType: 'TEXT',
       },
+      {
+        name: 'srcsystemid',
+        prop: 'source_system_id',
+        dataType: 'PICKUPDATA',
+      },
       {
         name: 'srcentityid',
         prop: 'source_entity_id',
@@ -100,6 +100,11 @@ export default class MainModel {
         prop: 'ds_id',
         dataType: 'TEXT',
       },
+      {
+        name: 'systemid',
+        prop: 'system_id',
+        dataType: 'PICKUPDATA',
+      },
       {
         name: 'entityid',
         prop: 'entity_id',

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="root" id="tab-da_build-1-1">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-da_chart-1-2">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-da_metric-1-3">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-da_report-1-4">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-dict_catalog-6-5">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-dict_option-5-6">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-dst_datasource-1-7">
+    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-3-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="root" id="tab-dst_system-1-8">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-ru_execlog-1-9">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-ru_execresult-1-10">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-meta_dataset-1-11">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-meta_entity-5-12">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-meta_field-1-13">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-meta_model-1-14">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-meta_module-1-15">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-meta_relation-1-16">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-ru_engine-1-17">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-ru_item-1-18">
+    <changeSet author="a_A_5d9d78509" 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="root" id="tab-etl_table_sync-68-19">
+    <changeSet author="a_A_5d9d78509" id="tab-etl_table_sync-72-19">
         <createTable tableName="IBZTABLESYNC">
                 <column name="SYNCID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_ETL_TABLE_SYNC_SYNCID"/>
@@ -585,13 +585,13 @@
         <!--输出实体[DA_BUILD]外键关系 -->
         <!--输出实体[DA_CHART]外键关系 -->
         <!--输出实体[DA_METRIC]外键关系 -->
-    <changeSet author="root" id="fk-da_metric-1-20">
+    <changeSet author="a_A_5d9d78509" 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="root" id="fk-dict_option-5-21">
+    <changeSet author="a_A_5d9d78509" 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

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="TableSyncResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`DSID`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`ETLTIMESTAMP`, t1.`ISENABLE`, t1.`LASTENDTIME`, t1.`LASTREAD`, t1.`LASTRUNRESULT`, t1.`LASTRUNTIME`, t1.`LASTWRITE`, t1.`MAPPINGCFG`, t1.`RUNCRON`, t1.`RUNORDER`, t1.`SRCDSID`, t1.`SRCENTITYID`, t1.`SRCENTITYNAME`, t1.`SRCEXP`, t1.`SYNCGROUP`, t1.`SYNCID`, t1.`SYNCNAME`, t1.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZTABLESYNC` t1  ) t1 where syncid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`DSID`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`ETLTIMESTAMP`, t1.`ISENABLE`, t1.`LASTENDTIME`, t1.`LASTREAD`, t1.`LASTRUNRESULT`, t1.`LASTRUNTIME`, t1.`LASTWRITE`, t1.`MAPPINGCFG`, t1.`RUNCRON`, t1.`RUNORDER`, t1.`SRCDSID`, t1.`SRCENTITYID`, t1.`SRCENTITYNAME`, t1.`SRCEXP`, t1.`SRCSYSTEMID`, t1.`SYNCGROUP`, t1.`SYNCID`, t1.`SYNCNAME`, t1.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZTABLESYNC` t1  ) t1 where syncid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -54,12 +54,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`DSID`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`ETLTIMESTAMP`, t1.`ISENABLE`, t1.`LASTENDTIME`, t1.`LASTREAD`, t1.`LASTRUNRESULT`, t1.`LASTRUNTIME`, t1.`LASTWRITE`, t1.`RUNCRON`, t1.`RUNORDER`, t1.`SRCDSID`, t1.`SRCENTITYID`, t1.`SRCENTITYNAME`, t1.`SYNCGROUP`, t1.`SYNCID`, t1.`SYNCNAME`, t1.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZTABLESYNC` t1  
+		<![CDATA[ SELECT t1.`DSID`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`ETLTIMESTAMP`, t1.`ISENABLE`, t1.`LASTENDTIME`, t1.`LASTREAD`, t1.`LASTRUNRESULT`, t1.`LASTRUNTIME`, t1.`LASTWRITE`, t1.`RUNCRON`, t1.`RUNORDER`, t1.`SRCDSID`, t1.`SRCENTITYID`, t1.`SRCENTITYNAME`, t1.`SRCSYSTEMID`, t1.`SYNCGROUP`, t1.`SYNCID`, t1.`SYNCNAME`, t1.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZTABLESYNC` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`DSID`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`ETLTIMESTAMP`, t1.`ISENABLE`, t1.`LASTENDTIME`, t1.`LASTREAD`, t1.`LASTRUNRESULT`, t1.`LASTRUNTIME`, t1.`LASTWRITE`, t1.`MAPPINGCFG`, t1.`RUNCRON`, t1.`RUNORDER`, t1.`SRCDSID`, t1.`SRCENTITYID`, t1.`SRCENTITYNAME`, t1.`SRCEXP`, t1.`SYNCGROUP`, t1.`SYNCID`, t1.`SYNCNAME`, t1.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZTABLESYNC` t1  
+		<![CDATA[ SELECT t1.`DSID`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`ETLTIMESTAMP`, t1.`ISENABLE`, t1.`LASTENDTIME`, t1.`LASTREAD`, t1.`LASTRUNRESULT`, t1.`LASTRUNTIME`, t1.`LASTWRITE`, t1.`MAPPINGCFG`, t1.`RUNCRON`, t1.`RUNORDER`, t1.`SRCDSID`, t1.`SRCENTITYID`, t1.`SRCENTITYNAME`, t1.`SRCEXP`, t1.`SRCSYSTEMID`, t1.`SYNCGROUP`, t1.`SYNCID`, t1.`SYNCNAME`, t1.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZTABLESYNC` t1  
 			]]>
     </sql>
 </mapper>

ibzdst-core/src/main/resources/sysmodel/RuntimeDict.json

@@ -132,6 +132,7 @@
 
 
 
+
 
 
 ]

ibzdst-util/src/main/java/cn/ibizlab/util/dict/StaticDict.java

@@ -520,6 +520,7 @@ public class StaticDict {
     }
 
 
+
     /**
      * 代码表[图表类型]
      */