Skip to content

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

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

上级 34166e75
显示空白字符变更
内嵌 并排
正在显示 包含 75 行增加 和 21 行删除
app_web/src/locale/lanres/entities/rule-item/rule-item_en_US.ts
浏览文件 @ f0953f23
......@@ -10,6 +10,7 @@ export default {
cfg: "配置",
field_set: "属性集合",
memo: "备注",
rule_code: "规则码",
cus_tag: "自定义",
cond: "条件",
createdate: "建立时间",
......
app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN.ts
浏览文件 @ f0953f23
......@@ -9,6 +9,7 @@ export default {
cfg: "配置",
field_set: "属性集合",
memo: "备注",
rule_code: "规则码",
cus_tag: "自定义",
cond: "条件",
createdate: "建立时间",
......
app_web/src/widgets/rule-item/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ f0953f23
......@@ -42,6 +42,9 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'memo',
},
{
name: 'rule_code',
},
{
name: 'cus_tag',
},
......
ibzdst-core/src/main/java/cn/ibizlab/core/rule/domain/RuleItem.java
浏览文件 @ f0953f23
......@@ -108,6 +108,13 @@ public class RuleItem extends EntityMP implements Serializable {
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 规则码
*/
@TableField(value = "rulecode")
@JSONField(name = "rule_code")
@JsonProperty("rule_code")
private String ruleCode;
/**
* 自定义
*/
......@@ -222,6 +229,14 @@ public class RuleItem extends EntityMP implements Serializable {
this.modify("memo", memo);
}
/**
* 设置 [规则码]
*/
public void setRuleCode(String ruleCode) {
this.ruleCode = ruleCode;
this.modify("rulecode", ruleCode);
}
/**
* 设置 [自定义]
*/
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ f0953f23
......@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_build-45-1">
<changeSet author="root" id="tab-da_build-45-1">
<createTable tableName="IBZDABUILD">
<column name="BUILDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
......@@ -26,7 +26,7 @@
<!--输出实体[DA_CHART]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_chart-22-2">
<changeSet author="root" id="tab-da_chart-22-2">
<createTable tableName="IBZDACHART">
<column name="CHARTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_CHART_CHARTID"/>
......@@ -48,7 +48,7 @@
<!--输出实体[DA_METRIC]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_metric-53-3">
<changeSet author="root" id="tab-da_metric-53-3">
<createTable tableName="IBZDAMETRIC">
<column name="DA_METRICID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
......@@ -76,7 +76,7 @@
<!--输出实体[DA_REPORT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_report-24-4">
<changeSet author="root" id="tab-da_report-24-4">
<createTable tableName="IBZDAREPORT">
<column name="REPORTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/>
......@@ -98,7 +98,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-6-5">
<changeSet author="root" id="tab-dst_datasource-6-5">
<createTable tableName="IBZDATASOURCE">
<column name="DSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
......@@ -114,7 +114,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_system-5-6">
<changeSet author="root" id="tab-dst_system-5-6">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
......@@ -134,7 +134,7 @@
<!--输出实体[RU_EXECLOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_execlog-31-7">
<changeSet author="root" id="tab-ru_execlog-31-7">
<createTable tableName="IBZRULELOG">
<column name="RU_EXECLOGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECLOG_RU_EXECLOGID"/>
......@@ -164,7 +164,7 @@
<!--输出实体[RU_EXECRESULT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_execresult-43-8">
<changeSet author="root" id="tab-ru_execresult-43-8">
<createTable tableName="IBZRULERESULT">
<column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/>
......@@ -204,7 +204,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dataset-2-9">
<changeSet author="root" id="tab-meta_dataset-2-9">
<createTable tableName="IBZDATASET">
<column name="DATASETID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
......@@ -226,7 +226,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-12-10">
<changeSet author="root" id="tab-meta_entity-12-10">
<createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
......@@ -258,7 +258,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-7-11">
<changeSet author="root" id="tab-meta_field-7-11">
<createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......@@ -322,7 +322,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_model-18-12">
<changeSet author="root" id="tab-meta_model-18-12">
<createTable tableName="IBZMODEL">
<column name="MODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
......@@ -348,7 +348,7 @@
<!--输出实体[META_MODULE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_module-7-13">
<changeSet author="root" id="tab-meta_module-7-13">
<createTable tableName="IBZMODULE">
<column name="MODULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
......@@ -366,7 +366,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-6-14">
<changeSet author="root" id="tab-meta_relation-6-14">
<createTable tableName="IBZRELATION">
<column name="RELATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
......@@ -398,7 +398,7 @@
<!--输出实体[RU_ENGINE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_engine-29-15">
<changeSet author="root" id="tab-ru_engine-29-15">
<createTable tableName="IBZRULEENGINE">
<column name="ENGINEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
......@@ -420,7 +420,7 @@
<!--输出实体[RU_ITEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_item-57-16">
<changeSet author="root" id="tab-ru_item-59-16">
<createTable tableName="IBZRULE">
<column name="RULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
......@@ -441,6 +441,8 @@
</column>
<column name="MEMO" remarks="" type="VARCHAR(2000)">
</column>
<column name="RULECODE" remarks="" type="VARCHAR(100)">
</column>
<column name="CUSTAG" remarks="" type="INT">
</column>
<column name="COND" remarks="" type="TEXT(1048576)">
......@@ -455,7 +457,7 @@
<!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[DA_METRIC]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-da_metric-53-17">
<changeSet author="root" id="fk-da_metric-53-17">
<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]外键关系 -->
......@@ -463,7 +465,7 @@
<!--输出实体[DST_SYSTEM]外键关系 -->
<!--输出实体[RU_EXECLOG]外键关系 -->
<!--输出实体[RU_EXECRESULT]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ru_execresult-43-18">
<changeSet author="root" id="fk-ru_execresult-43-18">
<addForeignKeyConstraint baseColumnNames="RULEID" baseTableName="IBZRULERESULT" constraintName="DER1N_RU_EXECRESULT_RU_ITEM_RU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="RULEID" referencedTableName="IBZRULE" validate="true"/>
</changeSet>
<!--输出实体[META_DATASET]外键关系 -->
......
ibzdst-core/src/main/resources/mapper/rule/ruleitem/RuleItemMapper.xml
浏览文件 @ f0953f23
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where ruleid=#{id}]]>
</select>
<select id="selectById" resultMap="RuleItemResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.BUSINESSCAT, t1.CFG, t1.COND, t1.CREATEDATE, t1.CUSTAG, t1.FIELDSET, t1.MEMO, t1.MODELID, t1.MODELNAME, t1.RULEGROUP, t1.RULEID, t1.RULENAME, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRULE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where ruleid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.BUSINESSCAT, t1.CFG, t1.COND, t1.CREATEDATE, t1.CUSTAG, t1.FIELDSET, t1.MEMO, t1.MODELID, t1.MODELNAME, t1.RULECODE, t1.RULEGROUP, t1.RULEID, t1.RULENAME, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRULE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where ruleid=#{id}]]>
</select>
<select id="selectById" resultMap="RuleItemResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.BUSINESSCAT, t1.CFG, t1.COND, t1.CREATEDATE, t1.CUSTAG, t1.FIELDSET, t1.MEMO, t1.MODELID, t1.MODELNAME, t1.RULEGROUP, t1.RULEID, t1.RULENAME, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRULE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where ruleid=#{id}]]>
......@@ -49,7 +49,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.BUSINESSCAT, t1.CREATEDATE, t1.CUSTAG, t1.MEMO, t1.MODELID, t1.MODELNAME, t1.RULEGROUP, t1.RULEID, t1.RULENAME, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRULE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.BUSINESSCAT, t1.CREATEDATE, t1.CUSTAG, t1.MEMO, t1.MODELID, t1.MODELNAME, t1.RULECODE, t1.RULEGROUP, t1.RULEID, t1.RULENAME, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRULE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
<!--数据查询[Default]-->
......@@ -64,7 +64,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.BUSINESSCAT, t1.CFG, t1.COND, t1.CREATEDATE, t1.CUSTAG, t1.FIELDSET, t1.MEMO, t1.MODELID, t1.MODELNAME, t1.RULEGROUP, t1.RULEID, t1.RULENAME, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRULE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.BUSINESSCAT, t1.CFG, t1.COND, t1.CREATEDATE, t1.CUSTAG, t1.FIELDSET, t1.MEMO, t1.MODELID, t1.MODELNAME, t1.RULECODE, t1.RULEGROUP, t1.RULEID, t1.RULENAME, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRULE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
<!--数据查询[View]-->
......
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @ f0953f23
......@@ -3373,6 +3373,20 @@
"major_field":0
},
{
"fieldname":"RULECODE" ,
"codename":"Rule_code",
"field_logic_name":"规则码",
"entity_name":"RuleItem",
"field_type":"TEXT",
"nullable":0,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":10,
"major_field":0
},
{
"fieldname":"CUSTAG" ,
"codename":"Cus_tag",
"field_logic_name":"自定义",
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/RuleItemDTO.java
浏览文件 @ f0953f23
......@@ -110,6 +110,16 @@ public class RuleItemDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 2000, message = "内容长度必须小于等于[2000]")
private String memo;
/**
* 属性 [RULECODE]
*
*/
@JSONField(name = "rule_code")
@JsonProperty("rule_code")
@NotBlank(message = "[规则码]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String ruleCode;
/**
* 属性 [CUSTAG]
*
......@@ -219,6 +229,14 @@ public class RuleItemDTO extends DTOBase implements Serializable {
this.modify("memo",memo);
}
/**
* 设置 [RULECODE]
*/
public void setRuleCode(String ruleCode){
this.ruleCode = ruleCode ;
this.modify("rulecode",ruleCode);
}
/**
* 设置 [CUSTAG]
*/
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或