Skip to content

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

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

上级 7541d64b
隐藏空白字符变更
内嵌 并排
正在显示 包含 187 行增加 和 190 行删除
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_BO_CN_base.ts
浏览文件 @ d56e9a7b
...@@ -4,12 +4,12 @@ function getLocaleResourceBase(){ ...@@ -4,12 +4,12 @@ function getLocaleResourceBase(){
const data:any = { const data:any = {
fields: { fields: {
dynainstid: commonLogic.appcommonhandle("动态实例",null), dynainstid: commonLogic.appcommonhandle("动态实例",null),
status: commonLogic.appcommonhandle("状态",null),
modelfile: commonLogic.appcommonhandle("文件",null),
configname: commonLogic.appcommonhandle("配置名称",null),
configid: commonLogic.appcommonhandle("配置标识",null),
system_id: commonLogic.appcommonhandle("系统",null), system_id: commonLogic.appcommonhandle("系统",null),
configid: commonLogic.appcommonhandle("配置标识",null),
configname: commonLogic.appcommonhandle("配置名称",null),
pdynainstid: commonLogic.appcommonhandle("父实例",null), pdynainstid: commonLogic.appcommonhandle("父实例",null),
modelfile: commonLogic.appcommonhandle("文件",null),
status: commonLogic.appcommonhandle("状态",null),
}, },
views: { views: {
editview: { editview: {
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_en_US_base.ts
浏览文件 @ d56e9a7b
...@@ -4,12 +4,12 @@ function getLocaleResourceBase(){ ...@@ -4,12 +4,12 @@ function getLocaleResourceBase(){
const data:any = { const data:any = {
fields: { fields: {
dynainstid: commonLogic.appcommonhandle("动态实例",null), dynainstid: commonLogic.appcommonhandle("动态实例",null),
status: commonLogic.appcommonhandle("状态",null),
modelfile: commonLogic.appcommonhandle("文件",null),
configname: commonLogic.appcommonhandle("配置名称",null),
configid: commonLogic.appcommonhandle("配置标识",null),
system_id: commonLogic.appcommonhandle("系统",null), system_id: commonLogic.appcommonhandle("系统",null),
configid: commonLogic.appcommonhandle("配置标识",null),
configname: commonLogic.appcommonhandle("配置名称",null),
pdynainstid: commonLogic.appcommonhandle("父实例",null), pdynainstid: commonLogic.appcommonhandle("父实例",null),
modelfile: commonLogic.appcommonhandle("文件",null),
status: commonLogic.appcommonhandle("状态",null),
}, },
views: { views: {
editview: { editview: {
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_zh_CN_base.ts
浏览文件 @ d56e9a7b
...@@ -4,12 +4,12 @@ function getLocaleResourceBase(){ ...@@ -4,12 +4,12 @@ function getLocaleResourceBase(){
const data:any = { const data:any = {
fields: { fields: {
dynainstid: commonLogic.appcommonhandle("动态实例",null), dynainstid: commonLogic.appcommonhandle("动态实例",null),
status: commonLogic.appcommonhandle("状态",null),
modelfile: commonLogic.appcommonhandle("文件",null),
configname: commonLogic.appcommonhandle("配置名称",null),
configid: commonLogic.appcommonhandle("配置标识",null),
system_id: commonLogic.appcommonhandle("系统",null), system_id: commonLogic.appcommonhandle("系统",null),
configid: commonLogic.appcommonhandle("配置标识",null),
configname: commonLogic.appcommonhandle("配置名称",null),
pdynainstid: commonLogic.appcommonhandle("父实例",null), pdynainstid: commonLogic.appcommonhandle("父实例",null),
modelfile: commonLogic.appcommonhandle("文件",null),
status: commonLogic.appcommonhandle("状态",null),
}, },
views: { views: {
editview: { editview: {
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaDynamicModel.java
浏览文件 @ d56e9a7b
...@@ -55,30 +55,13 @@ public class MetaDynamicModel extends EntityMP implements Serializable { ...@@ -55,30 +55,13 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
@ApiModelProperty("动态实例") @ApiModelProperty("动态实例")
private String dynainstid; private String dynainstid;
/** /**
* 状态 * 系统
*/
@DEField(defaultValue = "0")
@TableField(value = "status")
@JSONField(name = "status")
@JsonProperty("status")
@ApiModelProperty("状态")
private String status;
/**
* 文件
*/
@TableField(value = "modelfile")
@JSONField(name = "modelfile")
@JsonProperty("modelfile")
@ApiModelProperty("文件")
private String modelfile;
/**
* 配置名称
*/ */
@TableField(value = "configname") @TableField(value = "systemid")
@JSONField(name = "configname") @JSONField(name = "system_id")
@JsonProperty("configname") @JsonProperty("system_id")
@ApiModelProperty("配置名称") @ApiModelProperty("系统")
private String configname; private String systemId;
/** /**
* 配置标识 * 配置标识
*/ */
...@@ -89,13 +72,13 @@ public class MetaDynamicModel extends EntityMP implements Serializable { ...@@ -89,13 +72,13 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
@ApiModelProperty("配置标识") @ApiModelProperty("配置标识")
private String configid; private String configid;
/** /**
* 系统 * 配置名称
*/ */
@TableField(value = "systemid") @TableField(value = "configname")
@JSONField(name = "system_id") @JSONField(name = "configname")
@JsonProperty("system_id") @JsonProperty("configname")
@ApiModelProperty("系统") @ApiModelProperty("配置名称")
private String systemId; private String configname;
/** /**
* 父实例 * 父实例
*/ */
...@@ -104,6 +87,23 @@ public class MetaDynamicModel extends EntityMP implements Serializable { ...@@ -104,6 +87,23 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
@JsonProperty("pdynainstid") @JsonProperty("pdynainstid")
@ApiModelProperty("父实例") @ApiModelProperty("父实例")
private String pdynainstid; private String pdynainstid;
/**
* 文件
*/
@TableField(value = "modelfile")
@JSONField(name = "modelfile")
@JsonProperty("modelfile")
@ApiModelProperty("文件")
private String modelfile;
/**
* 状态
*/
@DEField(defaultValue = "0")
@TableField(value = "status")
@JSONField(name = "status")
@JsonProperty("status")
@ApiModelProperty("状态")
private String status;
/** /**
* *
...@@ -132,19 +132,11 @@ public class MetaDynamicModel extends EntityMP implements Serializable { ...@@ -132,19 +132,11 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
} }
/** /**
* 设置 [状态] * 设置 [系统]
*/
public void setStatus(String status) {
this.status = status;
this.modify("status", status);
}
/**
* 设置 [文件]
*/ */
public void setModelfile(String modelfile) { public void setSystemId(String systemId) {
this.modelfile = modelfile; this.systemId = systemId;
this.modify("modelfile", modelfile); this.modify("systemid", systemId);
} }
/** /**
...@@ -155,14 +147,6 @@ public class MetaDynamicModel extends EntityMP implements Serializable { ...@@ -155,14 +147,6 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
this.modify("configname", configname); this.modify("configname", configname);
} }
/**
* 设置 [系统]
*/
public void setSystemId(String systemId) {
this.systemId = systemId;
this.modify("systemid", systemId);
}
/** /**
* 设置 [父实例] * 设置 [父实例]
*/ */
...@@ -171,6 +155,22 @@ public class MetaDynamicModel extends EntityMP implements Serializable { ...@@ -171,6 +155,22 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
this.modify("pdynainstid", pdynainstid); this.modify("pdynainstid", pdynainstid);
} }
/**
* 设置 [文件]
*/
public void setModelfile(String modelfile) {
this.modelfile = modelfile;
this.modify("modelfile", modelfile);
}
/**
* 设置 [状态]
*/
public void setStatus(String status) {
this.status = status;
this.modify("status", status);
}
/** /**
* 复制当前对象数据到目标对象(粘贴重置) * 复制当前对象数据到目标对象(粘贴重置)
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/filter/MetaDynamicModelSearchContext.java
浏览文件 @ d56e9a7b
...@@ -27,11 +27,11 @@ import cn.ibizlab.core.lite.domain.MetaDynamicModel; ...@@ -27,11 +27,11 @@ import cn.ibizlab.core.lite.domain.MetaDynamicModel;
@Data @Data
public class MetaDynamicModelSearchContext extends QueryWrapperContext<MetaDynamicModel> { public class MetaDynamicModelSearchContext extends QueryWrapperContext<MetaDynamicModel> {
private String n_status_eq;//[状态] private String n_systemid_eq;//[系统]
public void setN_status_eq(String n_status_eq) { public void setN_systemid_eq(String n_systemid_eq) {
this.n_status_eq = n_status_eq; this.n_systemid_eq = n_systemid_eq;
if(!ObjectUtils.isEmpty(this.n_status_eq)){ if(!ObjectUtils.isEmpty(this.n_systemid_eq)){
this.getSearchCond().eq("status", n_status_eq); this.getSearchCond().eq("systemid", n_systemid_eq);
} }
} }
private String n_configname_like;//[配置名称] private String n_configname_like;//[配置名称]
...@@ -40,13 +40,6 @@ public class MetaDynamicModelSearchContext extends QueryWrapperContext<MetaDynam ...@@ -40,13 +40,6 @@ public class MetaDynamicModelSearchContext extends QueryWrapperContext<MetaDynam
if(!ObjectUtils.isEmpty(this.n_configname_like)){ if(!ObjectUtils.isEmpty(this.n_configname_like)){
this.getSearchCond().like("configname", n_configname_like); this.getSearchCond().like("configname", n_configname_like);
} }
}
private String n_systemid_eq;//[系统]
public void setN_systemid_eq(String n_systemid_eq) {
this.n_systemid_eq = n_systemid_eq;
if(!ObjectUtils.isEmpty(this.n_systemid_eq)){
this.getSearchCond().eq("systemid", n_systemid_eq);
}
} }
private String n_pdynainstid_eq;//[父实例] private String n_pdynainstid_eq;//[父实例]
public void setN_pdynainstid_eq(String n_pdynainstid_eq) { public void setN_pdynainstid_eq(String n_pdynainstid_eq) {
...@@ -55,6 +48,13 @@ public class MetaDynamicModelSearchContext extends QueryWrapperContext<MetaDynam ...@@ -55,6 +48,13 @@ public class MetaDynamicModelSearchContext extends QueryWrapperContext<MetaDynam
this.getSearchCond().eq("pdynainstid", n_pdynainstid_eq); this.getSearchCond().eq("pdynainstid", n_pdynainstid_eq);
} }
} }
private String n_status_eq;//[状态]
public void setN_status_eq(String n_status_eq) {
this.n_status_eq = n_status_eq;
if(!ObjectUtils.isEmpty(this.n_status_eq)){
this.getSearchCond().eq("status", n_status_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ d56e9a7b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!--输出实体[BLADE_VISUAL]数据结构 --> <!--输出实体[BLADE_VISUAL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual-55-1"> <changeSet author="root" id="tab-blade_visual-55-1">
<createTable tableName="blade_visual"> <createTable tableName="blade_visual">
<column name="ID" remarks="" type="BIGINT"> <column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/> <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 --> <!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-23-2"> <changeSet author="root" id="tab-blade_visual_category-23-2">
<createTable tableName="blade_visual_category"> <createTable tableName="blade_visual_category">
<column name="ID" remarks="" type="BIGINT"> <column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/> <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<!--输出实体[BLADE_VISUAL_CONFIG]数据结构 --> <!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-18-3"> <changeSet author="root" id="tab-blade_visual_config-18-3">
<createTable tableName="blade_visual_config"> <createTable tableName="blade_visual_config">
<column name="ID" remarks="" type="BIGINT"> <column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/> <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<!--输出实体[BLADE_VISUAL_MAP]数据结构 --> <!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-18-4"> <changeSet author="root" id="tab-blade_visual_map-18-4">
<createTable tableName="blade_visual_map"> <createTable tableName="blade_visual_map">
<column name="ID" remarks="" type="BIGINT"> <column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/> <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<!--输出实体[DST_COMPONENT]数据结构 --> <!--输出实体[DST_COMPONENT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_component-59-5"> <changeSet author="root" id="tab-dst_component-59-5">
<createTable tableName="IBZCOMPONENT"> <createTable tableName="IBZCOMPONENT">
<column name="CID" remarks="" type="VARCHAR(100)"> <column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/> <constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<!--输出实体[DST_CONFIG]数据结构 --> <!--输出实体[DST_CONFIG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_config-32-6"> <changeSet author="root" id="tab-dst_config-32-6">
<createTable tableName="IBZCFG"> <createTable tableName="IBZCFG">
<column name="CFGID" remarks="" type="VARCHAR(100)"> <column name="CFGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/> <constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 --> <!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-77-7"> <changeSet author="root" id="tab-dst_datasource-77-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"/>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<!--输出实体[DST_ROUTER]数据结构 --> <!--输出实体[DST_ROUTER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_router-37-8"> <changeSet author="root" id="tab-dst_router-37-8">
<createTable tableName="IBZROUTER"> <createTable tableName="IBZROUTER">
<column name="ROUTERID" remarks="" type="VARCHAR(100)"> <column name="ROUTERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/> <constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<!--输出实体[DST_SYSTEM]数据结构 --> <!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_system-45-9"> <changeSet author="root" id="tab-dst_system-46-9">
<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"/>
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
<!--输出实体[DST_VIEW]数据结构 --> <!--输出实体[DST_VIEW]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_view-46-10"> <changeSet author="root" id="tab-dst_view-46-10">
<createTable tableName="IBZVIEW"> <createTable tableName="IBZVIEW">
<column name="VIEWID" remarks="" type="VARCHAR(100)"> <column name="VIEWID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/> <constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<!--输出实体[META_DATASET]数据结构 --> <!--输出实体[META_DATASET]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dataset-33-11"> <changeSet author="root" id="tab-meta_dataset-33-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"/>
...@@ -244,29 +244,29 @@ ...@@ -244,29 +244,29 @@
<!--输出实体[META_DYNAMICMODEL]数据结构 --> <!--输出实体[META_DYNAMICMODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-142-12"> <changeSet author="root" id="tab-meta_dynamicmodel-150-12">
<createTable tableName="IBZDYNAMICMODEL"> <createTable tableName="IBZDYNAMICMODEL">
<column name="DYNAINSTID" remarks="" type="VARCHAR(100)"> <column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="STATUS" remarks="" type="VARCHAR(60)"> <column name="SYSTEMID" remarks="" type="VARCHAR(100)">
</column>
<column name="MODELFILE" remarks="" type="VARCHAR(1000)">
</column>
<column name="CONFIGNAME" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="CONFIGID" remarks="" type="VARCHAR(100)"> <column name="CONFIGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DYNAMICMODEL_CONFIGID"/> <constraints primaryKey="true" primaryKeyName="PK_META_DYNAMICMODEL_CONFIGID"/>
</column> </column>
<column name="SYSTEMID" remarks="" type="VARCHAR(100)"> <column name="CONFIGNAME" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="PDYNAINSTID" remarks="" type="VARCHAR(100)"> <column name="PDYNAINSTID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="MODELFILE" remarks="" type="VARCHAR(1000)">
</column>
<column name="STATUS" remarks="" type="VARCHAR(60)">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[META_ENTITY]数据结构 --> <!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-105-13"> <changeSet author="root" id="tab-meta_entity-105-13">
<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"/>
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
<!--输出实体[META_FIELD]数据结构 --> <!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-153-14"> <changeSet author="root" id="tab-meta_field-153-14">
<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"/>
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
<!--输出实体[META_MODEL]数据结构 --> <!--输出实体[META_MODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_model-44-15"> <changeSet author="root" id="tab-meta_model-44-15">
<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"/>
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
<!--输出实体[META_MODULE]数据结构 --> <!--输出实体[META_MODULE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_module-34-16"> <changeSet author="root" id="tab-meta_module-34-16">
<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"/>
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
<!--输出实体[META_RELATION]数据结构 --> <!--输出实体[META_RELATION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-106-17"> <changeSet author="root" id="tab-meta_relation-106-17">
<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"/>
...@@ -448,10 +448,7 @@ ...@@ -448,10 +448,7 @@
<!--输出实体[DST_VIEW]外键关系 --> <!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[META_DATASET]外键关系 --> <!--输出实体[META_DATASET]外键关系 -->
<!--输出实体[META_DYNAMICMODEL]外键关系 --> <!--输出实体[META_DYNAMICMODEL]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-142-18"> <changeSet author="root" id="fk-meta_dynamicmodel-150-18">
<addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_DST_SY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-142-19">
<addForeignKeyConstraint baseColumnNames="PDYNAINSTID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_META_D" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONFIGID" referencedTableName="IBZDYNAMICMODEL" validate="true"/> <addForeignKeyConstraint baseColumnNames="PDYNAINSTID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_META_D" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONFIGID" referencedTableName="IBZDYNAMICMODEL" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[META_ENTITY]外键关系 --> <!--输出实体[META_ENTITY]外键关系 -->
......
ibzlite-core/src/main/resources/sysmodel/ibzlite.json
浏览文件 @ d56e9a7b
...@@ -1920,36 +1920,39 @@ ...@@ -1920,36 +1920,39 @@
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":1000, "show_order":1,
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"STATUS" , "fieldname":"SYSTEMID" ,
"codename":"Status", "codename":"System_id",
"field_logic_name":"状态", "field_logic_name":"系统",
"entity_name":"META_DYNAMICMODEL", "entity_name":"META_DYNAMICMODEL",
"field_type":"SSCODELIST", "ref_de":"DST_SYSTEM",
"dict":"DynamicModelStatus", "ref_field_name":"PSSYSTEMID",
"relation_name":"DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID",
"relation_codename":"System",
"field_type":"PICKUP",
"nullable":1, "nullable":1,
"physical_field":1, "physical_field":1,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":60, "data_length":100,
"key_field":0, "key_field":0,
"show_order":1000, "show_order":2,
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"MODELFILE" , "fieldname":"CONFIGID" ,
"codename":"Modelfile", "codename":"Configid",
"field_logic_name":"文件", "field_logic_name":"配置标识",
"entity_name":"META_DYNAMICMODEL", "entity_name":"META_DYNAMICMODEL",
"field_type":"TEXT", "field_type":"TEXT",
"nullable":1, "nullable":1,
"physical_field":1, "physical_field":1,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":1000, "data_length":100,
"key_field":0, "key_field":1,
"show_order":1000, "show_order":3,
"major_field":0 "major_field":0
}, },
{ {
...@@ -1963,57 +1966,54 @@ ...@@ -1963,57 +1966,54 @@
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":1000, "show_order":4,
"major_field":1 "major_field":1
}, },
{ {
"fieldname":"CONFIGID" , "fieldname":"PDYNAINSTID" ,
"codename":"Configid", "codename":"Pdynainstid",
"field_logic_name":"配置标识", "field_logic_name":"父实例",
"entity_name":"META_DYNAMICMODEL", "entity_name":"META_DYNAMICMODEL",
"field_type":"TEXT", "ref_de":"META_DYNAMICMODEL",
"ref_field_name":"CONFIGID",
"relation_name":"DER1N_META_DYNAMICMODEL_META_DYNAMICMODEL_PDYNAINSTID",
"relation_codename":"PDynamicInstId",
"field_type":"PICKUP",
"nullable":1, "nullable":1,
"physical_field":1, "physical_field":1,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":1, "key_field":0,
"show_order":1000, "show_order":5,
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"SYSTEMID" , "fieldname":"MODELFILE" ,
"codename":"System_id", "codename":"Modelfile",
"field_logic_name":"系统", "field_logic_name":"文件",
"entity_name":"META_DYNAMICMODEL", "entity_name":"META_DYNAMICMODEL",
"ref_de":"DST_SYSTEM", "field_type":"TEXT",
"ref_field_name":"PSSYSTEMID",
"relation_name":"DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID",
"relation_codename":"System",
"field_type":"PICKUP",
"nullable":1, "nullable":1,
"physical_field":1, "physical_field":1,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":1000,
"key_field":0, "key_field":0,
"show_order":1000, "show_order":6,
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"PDYNAINSTID" , "fieldname":"STATUS" ,
"codename":"Pdynainstid", "codename":"Status",
"field_logic_name":"父实例", "field_logic_name":"状态",
"entity_name":"META_DYNAMICMODEL", "entity_name":"META_DYNAMICMODEL",
"ref_de":"META_DYNAMICMODEL", "field_type":"SSCODELIST",
"ref_field_name":"CONFIGID", "dict":"DynamicModelStatus",
"relation_name":"DER1N_META_DYNAMICMODEL_META_DYNAMICMODEL_PDYNAINSTID",
"relation_codename":"PDynamicInstId",
"field_type":"PICKUP",
"nullable":1, "nullable":1,
"physical_field":1, "physical_field":1,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":60,
"key_field":0, "key_field":0,
"show_order":1000, "show_order":7,
"major_field":0 "major_field":0
} }
], ],
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaDynamicModelDTO.java
浏览文件 @ d56e9a7b
...@@ -43,24 +43,24 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable { ...@@ -43,24 +43,24 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
private String dynainstid; private String dynainstid;
/** /**
* 属性 [STATUS] * 属性 [SYSTEMID]
* *
*/ */
@JSONField(name = "status") @JSONField(name = "system_id")
@JsonProperty("status") @JsonProperty("system_id")
@Size(min = 0, max = 60, message = "内容长度必须小于等于[60]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("状态") @ApiModelProperty("系统")
private String status; private String systemId;
/** /**
* 属性 [MODELFILE] * 属性 [CONFIGID]
* *
*/ */
@JSONField(name = "modelfile") @JSONField(name = "configid")
@JsonProperty("modelfile") @JsonProperty("configid")
@Size(min = 0, max = 1000, message = "内容长度必须小于等于[1000]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("文件") @ApiModelProperty("配置标识")
private String modelfile; private String configid;
/** /**
* 属性 [CONFIGNAME] * 属性 [CONFIGNAME]
...@@ -73,34 +73,34 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable { ...@@ -73,34 +73,34 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
private String configname; private String configname;
/** /**
* 属性 [CONFIGID] * 属性 [PDYNAINSTID]
* *
*/ */
@JSONField(name = "configid") @JSONField(name = "pdynainstid")
@JsonProperty("configid") @JsonProperty("pdynainstid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("配置标识") @ApiModelProperty("父实例")
private String configid; private String pdynainstid;
/** /**
* 属性 [SYSTEMID] * 属性 [MODELFILE]
* *
*/ */
@JSONField(name = "system_id") @JSONField(name = "modelfile")
@JsonProperty("system_id") @JsonProperty("modelfile")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 1000, message = "内容长度必须小于等于[1000]")
@ApiModelProperty("系统") @ApiModelProperty("文件")
private String systemId; private String modelfile;
/** /**
* 属性 [PDYNAINSTID] * 属性 [STATUS]
* *
*/ */
@JSONField(name = "pdynainstid") @JSONField(name = "status")
@JsonProperty("pdynainstid") @JsonProperty("status")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 60, message = "内容长度必须小于等于[60]")
@ApiModelProperty("父实例") @ApiModelProperty("状态")
private String pdynainstid; private String status;
/** /**
...@@ -112,19 +112,11 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable { ...@@ -112,19 +112,11 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [STATUS] * 设置 [SYSTEMID]
*/
public void setStatus(String status){
this.status = status ;
this.modify("status",status);
}
/**
* 设置 [MODELFILE]
*/ */
public void setModelfile(String modelfile){ public void setSystemId(String systemId){
this.modelfile = modelfile ; this.systemId = systemId ;
this.modify("modelfile",modelfile); this.modify("systemid",systemId);
} }
/** /**
...@@ -135,14 +127,6 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable { ...@@ -135,14 +127,6 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
this.modify("configname",configname); this.modify("configname",configname);
} }
/**
* 设置 [SYSTEMID]
*/
public void setSystemId(String systemId){
this.systemId = systemId ;
this.modify("systemid",systemId);
}
/** /**
* 设置 [PDYNAINSTID] * 设置 [PDYNAINSTID]
*/ */
...@@ -151,6 +135,22 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable { ...@@ -151,6 +135,22 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
this.modify("pdynainstid",pdynainstid); this.modify("pdynainstid",pdynainstid);
} }
/**
* 设置 [MODELFILE]
*/
public void setModelfile(String modelfile){
this.modelfile = modelfile ;
this.modify("modelfile",modelfile);
}
/**
* 设置 [STATUS]
*/
public void setStatus(String status){
this.status = status ;
this.modify("status",status);
}
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或