Skip to content

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

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

上级 0915485f
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 625 行增加 和 98 行删除
app_web/src/locale/lanres/entities/dabuild/dabuild_en_US_base.ts
浏览文件 @ eb218c39
......@@ -10,6 +10,9 @@ function getLocaleResourceBase(){
model_name: commonLogic.appcommonhandle("模型名称",null),
state: commonLogic.appcommonhandle("状态",null),
dadimensions: commonLogic.appcommonhandle("维度",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
ext_params: commonLogic.appcommonhandle("扩展参数",null),
system_id: commonLogic.appcommonhandle("系统标识",null),
},
views: {
......@@ -37,6 +40,10 @@ function getLocaleResourceBase(){
main_form: {
details: {
druipart1: commonLogic.appcommonhandle("指标",null),
tabpage1: commonLogic.appcommonhandle("指标",null),
tabpage2: commonLogic.appcommonhandle("维度",null),
tabpage3: commonLogic.appcommonhandle("扩展参数",null),
tabpanel1: commonLogic.appcommonhandle("",null),
group1: commonLogic.appcommonhandle("分析基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srforikey: commonLogic.appcommonhandle("",null),
......@@ -50,7 +57,10 @@ function getLocaleResourceBase(){
lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
modelname: commonLogic.appcommonhandle("模型名称",null),
buildstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
dadimension: commonLogic.appcommonhandle("维度",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
modelid: commonLogic.appcommonhandle("模型标识",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
buildid: commonLogic.appcommonhandle("标识",null),
......@@ -64,6 +74,8 @@ function getLocaleResourceBase(){
modelname: commonLogic.appcommonhandle("模型名称",null),
lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
buildstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/locale/lanres/entities/dabuild/dabuild_zh_CN_base.ts
浏览文件 @ eb218c39
......@@ -10,6 +10,9 @@ function getLocaleResourceBase(){
model_name: commonLogic.appcommonhandle("模型名称",null),
state: commonLogic.appcommonhandle("状态",null),
dadimensions: commonLogic.appcommonhandle("维度",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
ext_params: commonLogic.appcommonhandle("扩展参数",null),
system_id: commonLogic.appcommonhandle("系统标识",null),
},
views: {
......@@ -37,6 +40,10 @@ function getLocaleResourceBase(){
main_form: {
details: {
druipart1: commonLogic.appcommonhandle("指标",null),
tabpage1: commonLogic.appcommonhandle("指标",null),
tabpage2: commonLogic.appcommonhandle("维度",null),
tabpage3: commonLogic.appcommonhandle("扩展参数",null),
tabpanel1: commonLogic.appcommonhandle("",null),
group1: commonLogic.appcommonhandle("分析基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srforikey: commonLogic.appcommonhandle("",null),
......@@ -50,7 +57,10 @@ function getLocaleResourceBase(){
lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
modelname: commonLogic.appcommonhandle("模型名称",null),
buildstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
dadimension: commonLogic.appcommonhandle("维度",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
modelid: commonLogic.appcommonhandle("模型标识",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
buildid: commonLogic.appcommonhandle("标识",null),
......@@ -64,6 +74,8 @@ function getLocaleResourceBase(){
modelname: commonLogic.appcommonhandle("模型名称",null),
lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
buildstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US_base.ts
浏览文件 @ eb218c39
......@@ -11,9 +11,9 @@ function getLocaleResourceBase(){
state: commonLogic.appcommonhandle("状态",null),
last_runtime: commonLogic.appcommonhandle("上次执行时间",null),
system_id: commonLogic.appcommonhandle("系统",null),
ext_params: commonLogic.appcommonhandle("扩展参数",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
ext_params: commonLogic.appcommonhandle("扩展参数",null),
},
views: {
editview: {
......@@ -39,8 +39,10 @@ function getLocaleResourceBase(){
enginename: commonLogic.appcommonhandle("名称",null),
rulegroup: commonLogic.appcommonhandle("规则分组",null),
modelname: commonLogic.appcommonhandle("模型",null),
execstate: commonLogic.appcommonhandle("状态",null),
lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
systemid: commonLogic.appcommonhandle("系统",null),
modelid: commonLogic.appcommonhandle("模型标识",null),
......@@ -56,6 +58,8 @@ function getLocaleResourceBase(){
modelname: commonLogic.appcommonhandle("模型",null),
lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN_base.ts
浏览文件 @ eb218c39
......@@ -11,9 +11,9 @@ function getLocaleResourceBase(){
state: commonLogic.appcommonhandle("状态",null),
last_runtime: commonLogic.appcommonhandle("上次执行时间",null),
system_id: commonLogic.appcommonhandle("系统",null),
ext_params: commonLogic.appcommonhandle("扩展参数",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
ext_params: commonLogic.appcommonhandle("扩展参数",null),
},
views: {
editview: {
......@@ -39,8 +39,10 @@ function getLocaleResourceBase(){
enginename: commonLogic.appcommonhandle("名称",null),
rulegroup: commonLogic.appcommonhandle("规则分组",null),
modelname: commonLogic.appcommonhandle("模型",null),
execstate: commonLogic.appcommonhandle("状态",null),
lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
systemid: commonLogic.appcommonhandle("系统",null),
modelid: commonLogic.appcommonhandle("模型标识",null),
......@@ -56,6 +58,8 @@ function getLocaleResourceBase(){
modelname: commonLogic.appcommonhandle("模型",null),
lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/widgets/dabuild/main-form/main-form-model.ts
浏览文件 @ eb218c39
......@@ -70,11 +70,26 @@ export default class MainModel {
prop: 'state',
dataType: 'TEXT',
},
{
name: 'total',
prop: 'total',
dataType: 'INT',
},
{
name: 'processed',
prop: 'processed',
dataType: 'INT',
},
{
name: 'dadimension',
prop: 'dadimensions',
dataType: 'ONE2MANYDATA',
},
{
name: 'extparams',
prop: 'ext_params',
dataType: 'LONGTEXT',
},
{
name: 'modelid',
prop: 'model_id',
......
app_web/src/widgets/dabuild/main-grid/main-grid-base.vue
浏览文件 @ eb218c39
......@@ -69,6 +69,30 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('total')">
<el-table-column show-overflow-tooltip :prop="'total'" :label="$t('entities.dabuild.main_grid.columns.total')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dabuild.main_grid.columns.total')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.total}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('processed')">
<el-table-column show-overflow-tooltip :prop="'processed'" :label="$t('entities.dabuild.main_grid.columns.processed')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dabuild.main_grid.columns.processed')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.processed}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -662,6 +686,24 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'total',
label: '总数',
langtag: 'entities.dabuild.main_grid.columns.total',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'processed',
label: '已处理数',
langtag: 'entities.dabuild.main_grid.columns.processed',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
]
/**
......@@ -1357,7 +1399,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['buildname','modelname','lastruntime','buildstate'];
let allColumns:Array<any> = ['buildname','modelname','lastruntime','buildstate','total','processed'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1441,6 +1483,8 @@ export default class MainBase extends Vue implements ControlInterface {
modelname:'',
lastruntime:'',
buildstate:'',
total:'',
processed:'',
children: children
}
groupTree.push(tree);
......@@ -1471,6 +1515,8 @@ export default class MainBase extends Vue implements ControlInterface {
modelname:'',
lastruntime:'',
buildstate:'',
total:'',
processed:'',
children: child
}
if(child && child.length > 0){
......@@ -1521,6 +1567,8 @@ export default class MainBase extends Vue implements ControlInterface {
modelname:'',
lastruntime:'',
buildstate:'',
total:'',
processed:'',
children: children,
}
groupTree.push(tree);
......
app_web/src/widgets/dabuild/main-grid/main-grid-model.ts
浏览文件 @ eb218c39
......@@ -26,11 +26,21 @@ export default class MainModel {
]
}else{
return [
{
name: 'total',
prop: 'total',
dataType: 'INT',
},
{
name: 'modelname',
prop: 'model_name',
dataType: 'PICKUPTEXT',
},
{
name: 'processed',
prop: 'processed',
dataType: 'INT',
},
{
name: 'buildstate',
prop: 'state',
......
app_web/src/widgets/rule-engine/main-form/main-form-base.vue
浏览文件 @ eb218c39
......@@ -68,6 +68,13 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.lastruntime.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='lastruntime' :itemRules="this.rules().lastruntime" class='' :caption="$t('entities.ruleengine.main_form.details.lastruntime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.lastruntime.error" :isEmptyCaption="false" labelPos="LEFT">
<date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" :value="data.lastruntime" :disabled="detailsModel.lastruntime.disabled" style="min-width: 150px; width:160px;" @on-change="(val1, val2) => { this.data.lastruntime = val1 }"></date-picker>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.execstate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='execstate' :itemRules="this.rules().execstate" class='' :caption="$t('entities.ruleengine.main_form.details.execstate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.execstate.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -83,9 +90,30 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.lastruntime.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='lastruntime' :itemRules="this.rules().lastruntime" class='' :caption="$t('entities.ruleengine.main_form.details.lastruntime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.lastruntime.error" :isEmptyCaption="false" labelPos="LEFT">
<date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" :value="data.lastruntime" :disabled="detailsModel.lastruntime.disabled" style="min-width: 150px; width:160px;" @on-change="(val1, val2) => { this.data.lastruntime = val1 }"></date-picker>
<i-col v-show="detailsModel.total.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='total' :itemRules="this.rules().total" class='' :caption="$t('entities.ruleengine.main_form.details.total')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.total.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.total"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.total.disabled"
type='number'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.processed.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='processed' :itemRules="this.rules().processed" class='' :caption="$t('entities.ruleengine.main_form.details.processed')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.processed.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.processed"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.processed.disabled"
type='number'
style="">
</input-box>
</app-form-item>
......@@ -496,8 +524,10 @@ export default class MainBase extends Vue implements ControlInterface {
enginename: null,
rulegroup: null,
modelname: null,
execstate: null,
lastruntime: null,
execstate: null,
total: null,
processed: null,
extparams: null,
systemid: null,
modelid: null,
......@@ -565,13 +595,21 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.modelname.required, type: 'string', message: '模型 值不能为空', trigger: 'change' },
{ required: this.detailsModel.modelname.required, type: 'string', message: '模型 值不能为空', trigger: 'blur' },
],
lastruntime: [
{ required: this.detailsModel.lastruntime.required, type: 'string', message: '上次执行时间 值不能为空', trigger: 'change' },
{ required: this.detailsModel.lastruntime.required, type: 'string', message: '上次执行时间 值不能为空', trigger: 'blur' },
],
execstate: [
{ required: this.detailsModel.execstate.required, type: 'string', message: '状态 值不能为空', trigger: 'change' },
{ required: this.detailsModel.execstate.required, type: 'string', message: '状态 值不能为空', trigger: 'blur' },
],
lastruntime: [
{ required: this.detailsModel.lastruntime.required, type: 'string', message: '上次执行时间 值不能为空', trigger: 'change' },
{ required: this.detailsModel.lastruntime.required, type: 'string', message: '上次执行时间 值不能为空', trigger: 'blur' },
total: [
{ required: this.detailsModel.total.required, type: 'number', message: '总数 值不能为空', trigger: 'change' },
{ required: this.detailsModel.total.required, type: 'number', message: '总数 值不能为空', trigger: 'blur' },
],
processed: [
{ required: this.detailsModel.processed.required, type: 'number', message: '已处理数 值不能为空', trigger: 'change' },
{ required: this.detailsModel.processed.required, type: 'number', message: '已处理数 值不能为空', trigger: 'blur' },
],
extparams: [
{ required: this.detailsModel.extparams.required, type: 'string', message: '扩展参数 值不能为空', trigger: 'change' },
......@@ -707,10 +745,14 @@ export default class MainBase extends Vue implements ControlInterface {
rulegroup: new FormItemModel({ caption: '规则分组', detailType: 'FORMITEM', name: 'rulegroup', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
modelname: new FormItemModel({ caption: '模型', detailType: 'FORMITEM', name: 'modelname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
lastruntime: new FormItemModel({ caption: '上次执行时间', detailType: 'FORMITEM', name: 'lastruntime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
execstate: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'execstate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
lastruntime: new FormItemModel({ caption: '上次执行时间', detailType: 'FORMITEM', name: 'lastruntime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
total: new FormItemModel({ caption: '总数', detailType: 'FORMITEM', name: 'total', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
processed: new FormItemModel({ caption: '已处理数', detailType: 'FORMITEM', name: 'processed', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
extparams: new FormItemModel({ caption: '扩展参数', detailType: 'FORMITEM', name: 'extparams', visible: true, isShowCaption: false, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -842,6 +884,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'modelname', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 lastruntime 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.lastruntime')
onLastruntimeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'lastruntime', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 execstate 值
*
......@@ -855,15 +909,27 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性 lastruntime 值
* 监控表单属性 total 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.lastruntime')
onLastruntimeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'lastruntime', newVal: newVal, oldVal: oldVal });
@Watch('data.total')
onTotalChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'total', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 processed 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.processed')
onProcessedChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'processed', newVal: newVal, oldVal: oldVal });
}
/**
......@@ -985,6 +1051,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
......
app_web/src/widgets/rule-engine/main-form/main-form-model.ts
浏览文件 @ eb218c39
......@@ -65,15 +65,25 @@ export default class MainModel {
prop: 'model_name',
dataType: 'PICKUPTEXT',
},
{
name: 'lastruntime',
prop: 'last_runtime',
dataType: 'DATETIME',
},
{
name: 'execstate',
prop: 'state',
dataType: 'TEXT',
},
{
name: 'lastruntime',
prop: 'last_runtime',
dataType: 'DATETIME',
name: 'total',
prop: 'total',
dataType: 'INT',
},
{
name: 'processed',
prop: 'processed',
dataType: 'INT',
},
{
name: 'extparams',
......
app_web/src/widgets/rule-engine/main-grid/main-grid-base.vue
浏览文件 @ eb218c39
......@@ -83,6 +83,30 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('total')">
<el-table-column show-overflow-tooltip :prop="'total'" :label="$t('entities.ruleengine.main_grid.columns.total')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ruleengine.main_grid.columns.total')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.total}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('processed')">
<el-table-column show-overflow-tooltip :prop="'processed'" :label="$t('entities.ruleengine.main_grid.columns.processed')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ruleengine.main_grid.columns.processed')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.processed}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -685,6 +709,24 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'total',
label: '总数',
langtag: 'entities.ruleengine.main_grid.columns.total',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'processed',
label: '已处理数',
langtag: 'entities.ruleengine.main_grid.columns.processed',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
]
/**
......@@ -1388,7 +1430,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['enginename','rulegroup','modelname','lastruntime','execstate'];
let allColumns:Array<any> = ['enginename','rulegroup','modelname','lastruntime','execstate','total','processed'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1473,6 +1515,8 @@ export default class MainBase extends Vue implements ControlInterface {
modelname:'',
lastruntime:'',
execstate:'',
total:'',
processed:'',
children: children
}
groupTree.push(tree);
......@@ -1504,6 +1548,8 @@ export default class MainBase extends Vue implements ControlInterface {
modelname:'',
lastruntime:'',
execstate:'',
total:'',
processed:'',
children: child
}
if(child && child.length > 0){
......@@ -1555,6 +1601,8 @@ export default class MainBase extends Vue implements ControlInterface {
modelname:'',
lastruntime:'',
execstate:'',
total:'',
processed:'',
children: children,
}
groupTree.push(tree);
......
app_web/src/widgets/rule-engine/main-grid/main-grid-model.ts
浏览文件 @ eb218c39
......@@ -26,11 +26,21 @@ export default class MainModel {
]
}else{
return [
{
name: 'total',
prop: 'total',
dataType: 'INT',
},
{
name: 'modelname',
prop: 'model_name',
dataType: 'PICKUPTEXT',
},
{
name: 'processed',
prop: 'processed',
dataType: 'INT',
},
{
name: 'enginename',
prop: 'engine_name',
......
ibzdst-core/src/main/java/cn/ibizlab/core/analysis/domain/DABuild.java
浏览文件 @ eb218c39
......@@ -88,6 +88,27 @@ public class DABuild extends EntityMP implements Serializable {
@JSONField(name = "state")
@JsonProperty("state")
private String state;
/**
* 总数
*/
@TableField(value = "total")
@JSONField(name = "total")
@JsonProperty("total")
private Integer total;
/**
* 已处理数
*/
@TableField(value = "processed")
@JSONField(name = "processed")
@JsonProperty("processed")
private Integer processed;
/**
* 扩展参数
*/
@TableField(value = "extparams")
@JSONField(name = "ext_params")
@JsonProperty("ext_params")
private String extParams;
/**
* 系统标识
*/
......@@ -171,6 +192,30 @@ public class DABuild extends EntityMP implements Serializable {
this.modify("buildstate", state);
}
/**
* 设置 [总数]
*/
public void setTotal(Integer total) {
this.total = total;
this.modify("total", total);
}
/**
* 设置 [已处理数]
*/
public void setProcessed(Integer processed) {
this.processed = processed;
this.modify("processed", processed);
}
/**
* 设置 [扩展参数]
*/
public void setExtParams(String extParams) {
this.extParams = extParams;
this.modify("extparams", extParams);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
......
ibzdst-core/src/main/java/cn/ibizlab/core/rule/domain/RuleEngine.java
浏览文件 @ eb218c39
......@@ -103,13 +103,6 @@ public class RuleEngine extends EntityMP implements Serializable {
@JSONField(name = "system_id")
@JsonProperty("system_id")
private String systemId;
/**
* 扩展参数
*/
@TableField(value = "extparams")
@JSONField(name = "ext_params")
@JsonProperty("ext_params")
private String extParams;
/**
* 总数
*/
......@@ -124,6 +117,13 @@ public class RuleEngine extends EntityMP implements Serializable {
@JSONField(name = "processed")
@JsonProperty("processed")
private Integer processed;
/**
* 扩展参数
*/
@TableField(value = "extparams")
@JSONField(name = "ext_params")
@JsonProperty("ext_params")
private String extParams;
/**
* 模型
......@@ -193,14 +193,6 @@ public class RuleEngine extends EntityMP implements Serializable {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return sdf.format(lastRuntime);
}
/**
* 设置 [扩展参数]
*/
public void setExtParams(String extParams) {
this.extParams = extParams;
this.modify("extparams", extParams);
}
/**
* 设置 [总数]
*/
......@@ -217,6 +209,14 @@ public class RuleEngine extends EntityMP implements Serializable {
this.modify("processed", processed);
}
/**
* 设置 [扩展参数]
*/
public void setExtParams(String extParams) {
this.extParams = extParams;
this.modify("extparams", extParams);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ eb218c39
......@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_build-49-1">
<changeSet author="root" id="tab-da_build-54-1">
<createTable tableName="IBZDABUILD">
<column name="BUILDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
......@@ -21,12 +21,18 @@
</column>
<column name="DADIMENSION" remarks="" type="TEXT(1048576)">
</column>
<column name="TOTAL" remarks="" type="INT">
</column>
<column name="PROCESSED" remarks="" type="INT">
</column>
<column name="EXTPARAMS" remarks="" type="TEXT(1048576)">
</column>
</createTable>
</changeSet>
<!--输出实体[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 +54,7 @@
<!--输出实体[DA_METRIC]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_metric-59-3">
<changeSet author="root" id="tab-da_metric-59-3">
<createTable tableName="IBZDAMETRIC">
<column name="DA_METRICID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
......@@ -76,7 +82,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 +104,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 +120,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 +140,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 +170,7 @@
<!--输出实体[RU_EXECRESULT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_execresult-46-8">
<changeSet author="root" id="tab-ru_execresult-46-8">
<createTable tableName="IBZRULERESULT">
<column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/>
......@@ -204,7 +210,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 +232,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-13-10">
<changeSet author="root" id="tab-meta_entity-13-10">
<createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
......@@ -258,7 +264,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 +328,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 +354,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 +372,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 +404,7 @@
<!--输出实体[RU_ENGINE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_engine-41-15">
<changeSet author="root" id="tab-ru_engine-45-15">
<createTable tableName="IBZRULEENGINE">
<column name="ENGINEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
......@@ -415,18 +421,18 @@
</column>
<column name="LASTRUNTIME" remarks="" type="DATETIME">
</column>
<column name="EXTPARAMS" remarks="" type="TEXT(1048576)">
</column>
<column name="TOTAL" remarks="" type="INT">
</column>
<column name="PROCESSED" remarks="" type="INT">
</column>
<column name="EXTPARAMS" remarks="" type="TEXT(1048576)">
</column>
</createTable>
</changeSet>
<!--输出实体[RU_ITEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_item-77-16">
<changeSet author="root" id="tab-ru_item-77-16">
<createTable tableName="IBZRULE">
<column name="RULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
......@@ -463,7 +469,7 @@
<!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[DA_METRIC]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-da_metric-59-17">
<changeSet author="root" id="fk-da_metric-59-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]外键关系 -->
......
ibzdst-core/src/main/resources/mapper/analysis/dabuild/DABuildMapper.xml
浏览文件 @ eb218c39
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`BUILDID`, t1.`BUILDNAME`, t1.`BUILDSTATE`, t1.`DADIMENSION`, t1.`LASTRUNTIME`, t1.`MODELID`, t1.`MODELNAME`, t11.`SYSTEMID` FROM `IBZDABUILD` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where buildid=#{id}]]>
</select>
<select id="selectById" resultMap="DABuildResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.BUILDID, t1.BUILDNAME, t1.BUILDSTATE, t1.DADIMENSION, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t11.SYSTEMID FROM IBZDABUILD t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where buildid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.BUILDID, t1.BUILDNAME, t1.BUILDSTATE, t1.DADIMENSION, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.PROCESSED, t11.SYSTEMID, t1.TOTAL FROM IBZDABUILD t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where buildid=#{id}]]>
</select>
<select id="selectById" resultMap="DABuildResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.BUILDID, t1.BUILDNAME, t1.BUILDSTATE, t1.DADIMENSION, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t11.SYSTEMID FROM IBZDABUILD t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where buildid=#{id}]]>
......@@ -50,7 +50,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.BUILDID, t1.BUILDNAME, t1.BUILDSTATE, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t11.SYSTEMID FROM IBZDABUILD t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.BUILDID, t1.BUILDNAME, t1.BUILDSTATE, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.PROCESSED, t11.SYSTEMID, t1.TOTAL FROM IBZDABUILD t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
<!--数据查询[Default]-->
......@@ -65,7 +65,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.BUILDID, t1.BUILDNAME, t1.BUILDSTATE, t1.DADIMENSION, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t11.SYSTEMID FROM IBZDABUILD t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.BUILDID, t1.BUILDNAME, t1.BUILDSTATE, t1.DADIMENSION, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.PROCESSED, t11.SYSTEMID, t1.TOTAL FROM IBZDABUILD t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
<!--数据查询[View]-->
......
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @ eb218c39
......@@ -118,6 +118,47 @@
"major_field":0
},
{
"fieldname":"TOTAL" ,
"codename":"Total",
"field_logic_name":"总数",
"entity_name":"DABuild",
"field_type":"INT",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"key_field":0,
"show_order":12,
"major_field":0
},
{
"fieldname":"PROCESSED" ,
"codename":"Processed",
"field_logic_name":"已处理数",
"entity_name":"DABuild",
"field_type":"INT",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"data_length":100,
"key_field":0,
"show_order":13,
"major_field":0
},
{
"fieldname":"EXTPARAMS" ,
"codename":"Ext_params",
"field_logic_name":"扩展参数",
"entity_name":"DABuild",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":1,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":20,
"major_field":0
},
{
"fieldname":"SYSTEMID" ,
"codename":"System_id",
"field_logic_name":"系统标识",
......@@ -3216,20 +3257,6 @@
"major_field":0
},
{
"fieldname":"EXTPARAMS" ,
"codename":"Ext_params",
"field_logic_name":"扩展参数",
"entity_name":"RuleEngine",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":1,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":20,
"major_field":0
},
{
"fieldname":"TOTAL" ,
"codename":"Total",
"field_logic_name":"总数",
......@@ -3239,7 +3266,7 @@
"physical_field":1,
"data_type":"INT",
"key_field":0,
"show_order":1000,
"show_order":12,
"major_field":0
},
{
......@@ -3253,7 +3280,21 @@
"data_type":"INT",
"data_length":100,
"key_field":0,
"show_order":1000,
"show_order":13,
"major_field":0
},
{
"fieldname":"EXTPARAMS" ,
"codename":"Ext_params",
"field_logic_name":"扩展参数",
"entity_name":"RuleEngine",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":1,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":20,
"major_field":0
}
],
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/DABuildDTO.java
浏览文件 @ eb218c39
......@@ -83,6 +83,31 @@ public class DABuildDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String state;
/**
* 属性 [TOTAL]
*
*/
@JSONField(name = "total")
@JsonProperty("total")
private Integer total;
/**
* 属性 [PROCESSED]
*
*/
@JSONField(name = "processed")
@JsonProperty("processed")
private Integer processed;
/**
* 属性 [EXTPARAMS]
*
*/
@JSONField(name = "ext_params")
@JsonProperty("ext_params")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String extParams;
/**
* 属性 [SYSTEMID]
*
......@@ -133,6 +158,30 @@ public class DABuildDTO extends DTOBase implements Serializable {
this.modify("buildstate",state);
}
/**
* 设置 [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);
}
/**
* 设置 [EXTPARAMS]
*/
public void setExtParams(String extParams){
this.extParams = extParams ;
this.modify("extparams",extParams);
}
/**
* [DA_DIMENSION]
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/RuleEngineDTO.java
浏览文件 @ eb218c39
......@@ -101,15 +101,6 @@ public class RuleEngineDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String systemId;
/**
* 属性 [EXTPARAMS]
*
*/
@JSONField(name = "ext_params")
@JsonProperty("ext_params")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String extParams;
/**
* 属性 [TOTAL]
*
......@@ -126,6 +117,15 @@ public class RuleEngineDTO extends DTOBase implements Serializable {
@JsonProperty("processed")
private Integer processed;
/**
* 属性 [EXTPARAMS]
*
*/
@JSONField(name = "ext_params")
@JsonProperty("ext_params")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String extParams;
/**
* 设置 [ENGINENAME]
......@@ -175,14 +175,6 @@ public class RuleEngineDTO extends DTOBase implements Serializable {
this.modify("lastruntime",lastRuntime);
}
/**
* 设置 [EXTPARAMS]
*/
public void setExtParams(String extParams){
this.extParams = extParams ;
this.modify("extparams",extParams);
}
/**
* 设置 [TOTAL]
*/
......@@ -199,6 +191,14 @@ public class RuleEngineDTO extends DTOBase implements Serializable {
this.modify("processed",processed);
}
/**
* 设置 [EXTPARAMS]
*/
public void setExtParams(String extParams){
this.extParams = extParams ;
this.modify("extparams",extParams);
}
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或