Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdst
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdst
提交
ae66f86b
提交
ae66f86b
编写于
12月 18, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
hebao1234 发布系统代码 [ibz-dst,应用]
上级
fad5b671
变更
7
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
101 行增加
和
4 行删除
+101
-4
rule-engine_en_US_base.ts
...ale/lanres/entities/rule-engine/rule-engine_en_US_base.ts
+2
-0
rule-engine_zh_CN_base.ts
...ale/lanres/entities/rule-engine/rule-engine_zh_CN_base.ts
+2
-0
RuleEngine.java
...src/main/java/cn/ibizlab/core/rule/domain/RuleEngine.java
+30
-0
h2_table.xml
ibzdst-core/src/main/resources/liquibase/h2_table.xml
+5
-1
RuleEngineMapper.xml
...ain/resources/mapper/rule/ruleengine/RuleEngineMapper.xml
+3
-3
ibzdst.json
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
+27
-0
RuleEngineDTO.java
...r-api/src/main/java/cn/ibizlab/api/dto/RuleEngineDTO.java
+32
-0
未找到文件。
app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US_base.ts
浏览文件 @
ae66f86b
...
@@ -12,6 +12,8 @@ function getLocaleResourceBase(){
...
@@ -12,6 +12,8 @@ function getLocaleResourceBase(){
last_runtime
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
last_runtime
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
system_id
:
commonLogic
.
appcommonhandle
(
"系统"
,
null
),
system_id
:
commonLogic
.
appcommonhandle
(
"系统"
,
null
),
ext_params
:
commonLogic
.
appcommonhandle
(
"扩展参数"
,
null
),
ext_params
:
commonLogic
.
appcommonhandle
(
"扩展参数"
,
null
),
total
:
commonLogic
.
appcommonhandle
(
"总数"
,
null
),
processed
:
commonLogic
.
appcommonhandle
(
"已处理数"
,
null
),
},
},
views
:
{
views
:
{
editview
:
{
editview
:
{
...
...
app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN_base.ts
浏览文件 @
ae66f86b
...
@@ -12,6 +12,8 @@ function getLocaleResourceBase(){
...
@@ -12,6 +12,8 @@ function getLocaleResourceBase(){
last_runtime
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
last_runtime
:
commonLogic
.
appcommonhandle
(
"上次执行时间"
,
null
),
system_id
:
commonLogic
.
appcommonhandle
(
"系统"
,
null
),
system_id
:
commonLogic
.
appcommonhandle
(
"系统"
,
null
),
ext_params
:
commonLogic
.
appcommonhandle
(
"扩展参数"
,
null
),
ext_params
:
commonLogic
.
appcommonhandle
(
"扩展参数"
,
null
),
total
:
commonLogic
.
appcommonhandle
(
"总数"
,
null
),
processed
:
commonLogic
.
appcommonhandle
(
"已处理数"
,
null
),
},
},
views
:
{
views
:
{
editview
:
{
editview
:
{
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/rule/domain/RuleEngine.java
浏览文件 @
ae66f86b
...
@@ -110,6 +110,20 @@ public class RuleEngine extends EntityMP implements Serializable {
...
@@ -110,6 +110,20 @@ public class RuleEngine extends EntityMP implements Serializable {
@JSONField
(
name
=
"ext_params"
)
@JSONField
(
name
=
"ext_params"
)
@JsonProperty
(
"ext_params"
)
@JsonProperty
(
"ext_params"
)
private
String
extParams
;
private
String
extParams
;
/**
* 总数
*/
@TableField
(
value
=
"total"
)
@JSONField
(
name
=
"total"
)
@JsonProperty
(
"total"
)
private
Integer
total
;
/**
* 已处理数
*/
@TableField
(
value
=
"processed"
)
@JSONField
(
name
=
"processed"
)
@JsonProperty
(
"processed"
)
private
Integer
processed
;
/**
/**
* 模型
* 模型
...
@@ -187,6 +201,22 @@ public class RuleEngine extends EntityMP implements Serializable {
...
@@ -187,6 +201,22 @@ public class RuleEngine extends EntityMP implements Serializable {
this
.
modify
(
"extparams"
,
extParams
);
this
.
modify
(
"extparams"
,
extParams
);
}
}
/**
* 设置 [总数]
*/
public
void
setTotal
(
Integer
total
)
{
this
.
total
=
total
;
this
.
modify
(
"total"
,
total
);
}
/**
* 设置 [已处理数]
*/
public
void
setProcessed
(
Integer
processed
)
{
this
.
processed
=
processed
;
this
.
modify
(
"processed"
,
processed
);
}
/**
/**
* 复制当前对象数据到目标对象(粘贴重置)
* 复制当前对象数据到目标对象(粘贴重置)
...
...
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
ae66f86b
...
@@ -398,7 +398,7 @@
...
@@ -398,7 +398,7 @@
<!--输出实体[RU_ENGINE]数据结构 -->
<!--输出实体[RU_ENGINE]数据结构 -->
<changeSet
author=
"root"
id=
"tab-ru_engine-
38
-15"
>
<changeSet
author=
"root"
id=
"tab-ru_engine-
41
-15"
>
<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"
/>
...
@@ -417,6 +417,10 @@
...
@@ -417,6 +417,10 @@
</column>
</column>
<column
name=
"EXTPARAMS"
remarks=
""
type=
"TEXT(1048576)"
>
<column
name=
"EXTPARAMS"
remarks=
""
type=
"TEXT(1048576)"
>
</column>
</column>
<column
name=
"TOTAL"
remarks=
""
type=
"INT"
>
</column>
<column
name=
"PROCESSED"
remarks=
""
type=
"INT"
>
</column>
</createTable>
</createTable>
</changeSet>
</changeSet>
...
...
ibzdst-core/src/main/resources/mapper/rule/ruleengine/RuleEngineMapper.xml
浏览文件 @
ae66f86b
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`ENGINEID`, t1.`ENGINENAME`, t1.`EXECSTATE`, t1.`EXTPARAMS`, t1.`LASTRUNTIME`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULEGROUP`, t11.`SYSTEMID` FROM `IBZRULEENGINE` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where engineid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`ENGINEID`, t1.`ENGINENAME`, t1.`EXECSTATE`, t1.`EXTPARAMS`, t1.`LASTRUNTIME`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULEGROUP`, t11.`SYSTEMID` FROM `IBZRULEENGINE` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where engineid=#{id}]]>
</select>
</select>
<select
id=
"selectById"
resultMap=
"RuleEngineResultMap"
databaseId=
"oracle"
>
<select
id=
"selectById"
resultMap=
"RuleEngineResultMap"
databaseId=
"oracle"
>
<![CDATA[select t1.* from (SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.
RULEGROUP, t11.SYSTEMID
FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where engineid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.
PROCESSED, t1.RULEGROUP, t11.SYSTEMID, t1.TOTAL
FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where engineid=#{id}]]>
</select>
</select>
<select
id=
"selectById"
resultMap=
"RuleEngineResultMap"
databaseId=
"postgresql"
>
<select
id=
"selectById"
resultMap=
"RuleEngineResultMap"
databaseId=
"postgresql"
>
<![CDATA[select t1.* from (SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.RULEGROUP, t11.SYSTEMID FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where engineid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.RULEGROUP, t11.SYSTEMID FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where engineid=#{id}]]>
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</sql>
</sql>
<!--数据查询[Default]-->
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"oracle"
>
<sql
id=
"Default"
databaseId=
"oracle"
>
<![CDATA[ SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.
RULEGROUP, t11.SYSTEMID
FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.
PROCESSED, t1.RULEGROUP, t11.SYSTEMID, t1.TOTAL
FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
]]>
</sql>
</sql>
<!--数据查询[Default]-->
<!--数据查询[Default]-->
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
</sql>
</sql>
<!--数据查询[View]-->
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"oracle"
>
<sql
id=
"View"
databaseId=
"oracle"
>
<![CDATA[ SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.
RULEGROUP, t11.SYSTEMID
FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.
PROCESSED, t1.RULEGROUP, t11.SYSTEMID, t1.TOTAL
FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
]]>
</sql>
</sql>
<!--数据查询[View]-->
<!--数据查询[View]-->
...
...
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @
ae66f86b
...
@@ -3228,6 +3228,33 @@
...
@@ -3228,6 +3228,33 @@
"key_field"
:
0
,
"key_field"
:
0
,
"show_order"
:
20
,
"show_order"
:
20
,
"major_field"
:
0
"major_field"
:
0
},
{
"fieldname"
:
"TOTAL"
,
"codename"
:
"Total"
,
"field_logic_name"
:
"总数"
,
"entity_name"
:
"RuleEngine"
,
"field_type"
:
"INT"
,
"nullable"
:
1
,
"physical_field"
:
1
,
"data_type"
:
"INT"
,
"key_field"
:
0
,
"show_order"
:
1000
,
"major_field"
:
0
},
{
"fieldname"
:
"PROCESSED"
,
"codename"
:
"Processed"
,
"field_logic_name"
:
"已处理数"
,
"entity_name"
:
"RuleEngine"
,
"field_type"
:
"INT"
,
"nullable"
:
1
,
"physical_field"
:
1
,
"data_type"
:
"INT"
,
"data_length"
:
100
,
"key_field"
:
0
,
"show_order"
:
1000
,
"major_field"
:
0
}
}
],
],
"subEntitys"
:[
"subEntitys"
:[
...
...
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/RuleEngineDTO.java
浏览文件 @
ae66f86b
...
@@ -110,6 +110,22 @@ public class RuleEngineDTO extends DTOBase implements Serializable {
...
@@ -110,6 +110,22 @@ public class RuleEngineDTO extends DTOBase implements Serializable {
@Size
(
min
=
0
,
max
=
1048576
,
message
=
"内容长度必须小于等于[1048576]"
)
@Size
(
min
=
0
,
max
=
1048576
,
message
=
"内容长度必须小于等于[1048576]"
)
private
String
extParams
;
private
String
extParams
;
/**
* 属性 [TOTAL]
*
*/
@JSONField
(
name
=
"total"
)
@JsonProperty
(
"total"
)
private
Integer
total
;
/**
* 属性 [PROCESSED]
*
*/
@JSONField
(
name
=
"processed"
)
@JsonProperty
(
"processed"
)
private
Integer
processed
;
/**
/**
* 设置 [ENGINENAME]
* 设置 [ENGINENAME]
...
@@ -167,6 +183,22 @@ public class RuleEngineDTO extends DTOBase implements Serializable {
...
@@ -167,6 +183,22 @@ public class RuleEngineDTO extends DTOBase implements Serializable {
this
.
modify
(
"extparams"
,
extParams
);
this
.
modify
(
"extparams"
,
extParams
);
}
}
/**
* 设置 [TOTAL]
*/
public
void
setTotal
(
Integer
total
){
this
.
total
=
total
;
this
.
modify
(
"total"
,
total
);
}
/**
* 设置 [PROCESSED]
*/
public
void
setProcessed
(
Integer
processed
){
this
.
processed
=
processed
;
this
.
modify
(
"processed"
,
processed
);
}
}
}
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录