Skip to content

I
ibztask
提交 9d2ba5a5 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_xuhui 发布系统代码 [ibiz-task，任务调度]

上级 c2f55e8d
隐藏空白字符变更
内嵌 并排
正在显示 包含 69 行增加 和 69 行删除
app_web/src/locale/lanres/entities/jobs-info/jobs-info_BO_CN_base.ts
浏览文件 @ 9d2ba5a5
...@@ -68,13 +68,13 @@ function getLocaleResourceBase(){ ...@@ -68,13 +68,13 @@ function getLocaleResourceBase(){
remark: commonLogic.appcommonhandle("备注",null), remark: commonLogic.appcommonhandle("备注",null),
handler: commonLogic.appcommonhandle("执行器任务HANDLER",null), handler: commonLogic.appcommonhandle("执行器任务HANDLER",null),
cron: commonLogic.appcommonhandle("任务执行CRON",null), cron: commonLogic.appcommonhandle("任务执行CRON",null),
last_run: commonLogic.appcommonhandle("上次执行时间",null),
next_run: commonLogic.appcommonhandle("下次执行时间",null),
last_time: commonLogic.appcommonhandle("上次调度时间",null), last_time: commonLogic.appcommonhandle("上次调度时间",null),
next_time: commonLogic.appcommonhandle("下次调度时间",null), next_time: commonLogic.appcommonhandle("下次调度时间",null),
status: commonLogic.appcommonhandle("状态",null), status: commonLogic.appcommonhandle("状态",null),
timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null), timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
update_time: commonLogic.appcommonhandle("更新时间",null), update_time: commonLogic.appcommonhandle("更新时间",null),
last_run: commonLogic.appcommonhandle("上次执行时间",null),
next_run: commonLogic.appcommonhandle("下次执行时间",null),
}, },
nodata:commonLogic.appcommonhandle("",null), nodata:commonLogic.appcommonhandle("",null),
uiactions: { uiactions: {
......
app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US_base.ts
浏览文件 @ 9d2ba5a5
...@@ -68,13 +68,13 @@ function getLocaleResourceBase(){ ...@@ -68,13 +68,13 @@ function getLocaleResourceBase(){
remark: commonLogic.appcommonhandle("备注",null), remark: commonLogic.appcommonhandle("备注",null),
handler: commonLogic.appcommonhandle("执行器任务HANDLER",null), handler: commonLogic.appcommonhandle("执行器任务HANDLER",null),
cron: commonLogic.appcommonhandle("任务执行CRON",null), cron: commonLogic.appcommonhandle("任务执行CRON",null),
last_run: commonLogic.appcommonhandle("上次执行时间",null),
next_run: commonLogic.appcommonhandle("下次执行时间",null),
last_time: commonLogic.appcommonhandle("上次调度时间",null), last_time: commonLogic.appcommonhandle("上次调度时间",null),
next_time: commonLogic.appcommonhandle("下次调度时间",null), next_time: commonLogic.appcommonhandle("下次调度时间",null),
status: commonLogic.appcommonhandle("状态",null), status: commonLogic.appcommonhandle("状态",null),
timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null), timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
update_time: commonLogic.appcommonhandle("更新时间",null), update_time: commonLogic.appcommonhandle("更新时间",null),
last_run: commonLogic.appcommonhandle("上次执行时间",null),
next_run: commonLogic.appcommonhandle("下次执行时间",null),
}, },
nodata:commonLogic.appcommonhandle("",null), nodata:commonLogic.appcommonhandle("",null),
uiactions: { uiactions: {
......
app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN_base.ts
浏览文件 @ 9d2ba5a5
...@@ -68,13 +68,13 @@ function getLocaleResourceBase(){ ...@@ -68,13 +68,13 @@ function getLocaleResourceBase(){
remark: commonLogic.appcommonhandle("备注",null), remark: commonLogic.appcommonhandle("备注",null),
handler: commonLogic.appcommonhandle("执行器任务HANDLER",null), handler: commonLogic.appcommonhandle("执行器任务HANDLER",null),
cron: commonLogic.appcommonhandle("任务执行CRON",null), cron: commonLogic.appcommonhandle("任务执行CRON",null),
last_run: commonLogic.appcommonhandle("上次执行时间",null),
next_run: commonLogic.appcommonhandle("下次执行时间",null),
last_time: commonLogic.appcommonhandle("上次调度时间",null), last_time: commonLogic.appcommonhandle("上次调度时间",null),
next_time: commonLogic.appcommonhandle("下次调度时间",null), next_time: commonLogic.appcommonhandle("下次调度时间",null),
status: commonLogic.appcommonhandle("状态",null), status: commonLogic.appcommonhandle("状态",null),
timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null), timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
update_time: commonLogic.appcommonhandle("更新时间",null), update_time: commonLogic.appcommonhandle("更新时间",null),
last_run: commonLogic.appcommonhandle("上次执行时间",null),
next_run: commonLogic.appcommonhandle("下次执行时间",null),
}, },
nodata:commonLogic.appcommonhandle("",null), nodata:commonLogic.appcommonhandle("",null),
uiactions: { uiactions: {
......
app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue
浏览文件 @ 9d2ba5a5
...@@ -83,6 +83,30 @@ ...@@ -83,6 +83,30 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('last_run')">
<el-table-column show-overflow-tooltip :prop="'last_run'" :label="$t('entities.jobsinfo.main_grid.columns.last_run')" :width="200" :align="'left'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.jobsinfo.main_grid.columns.last_run')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.last_run"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('next_run')">
<el-table-column show-overflow-tooltip :prop="'next_run'" :label="$t('entities.jobsinfo.main_grid.columns.next_run')" :width="200" :align="'left'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.jobsinfo.main_grid.columns.next_run')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.next_run"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('last_time')"> <template v-if="getColumnState('last_time')">
<el-table-column show-overflow-tooltip :prop="'last_time'" :label="$t('entities.jobsinfo.main_grid.columns.last_time')" :width="200" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'last_time'" :label="$t('entities.jobsinfo.main_grid.columns.last_time')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
...@@ -145,30 +169,6 @@ ...@@ -145,30 +169,6 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('last_run')">
<el-table-column show-overflow-tooltip :prop="'last_run'" :label="$t('entities.jobsinfo.main_grid.columns.last_run')" :width="200" :align="'left'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.jobsinfo.main_grid.columns.last_run')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.last_run"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('next_run')">
<el-table-column show-overflow-tooltip :prop="'next_run'" :label="$t('entities.jobsinfo.main_grid.columns.next_run')" :width="200" :align="'left'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.jobsinfo.main_grid.columns.next_run')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.next_run"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState"> <template v-if="adaptiveState">
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
...@@ -773,6 +773,24 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -773,6 +773,24 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false, isEnableRowEdit: false,
enableCond: 3 , enableCond: 3 ,
}, },
{
name: 'last_run',
label: '上次执行时间',
langtag: 'entities.jobsinfo.main_grid.columns.last_run',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'next_run',
label: '下次执行时间',
langtag: 'entities.jobsinfo.main_grid.columns.next_run',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{ {
name: 'last_time', name: 'last_time',
label: '上次调度时间', label: '上次调度时间',
...@@ -818,24 +836,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -818,24 +836,6 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false, isEnableRowEdit: false,
enableCond: 3 , enableCond: 3 ,
}, },
{
name: 'last_run',
label: '上次执行时间',
langtag: 'entities.jobsinfo.main_grid.columns.last_run',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'next_run',
label: '下次执行时间',
langtag: 'entities.jobsinfo.main_grid.columns.next_run',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
] ]
/** /**
...@@ -1551,7 +1551,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1551,7 +1551,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) { public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['id','app','remark','handler','cron','last_time','next_time','status','timeout','update_time','last_run','next_run']; let allColumns:Array<any> = ['id','app','remark','handler','cron','last_run','next_run','last_time','next_time','status','timeout','update_time'];
if(row && row.children) { if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) { if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1]; return [1, allColumns.length+1];
...@@ -1636,13 +1636,13 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1636,13 +1636,13 @@ export default class MainBase extends Vue implements ControlInterface {
remark:'', remark:'',
handler:'', handler:'',
cron:'', cron:'',
last_run:'',
next_run:'',
last_time:'', last_time:'',
next_time:'', next_time:'',
status:'', status:'',
timeout:'', timeout:'',
update_time:'', update_time:'',
last_run:'',
next_run:'',
children: children children: children
} }
groupTree.push(tree); groupTree.push(tree);
...@@ -1674,13 +1674,13 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1674,13 +1674,13 @@ export default class MainBase extends Vue implements ControlInterface {
remark:'', remark:'',
handler:'', handler:'',
cron:'', cron:'',
last_run:'',
next_run:'',
last_time:'', last_time:'',
next_time:'', next_time:'',
status:'', status:'',
timeout:'', timeout:'',
update_time:'', update_time:'',
last_run:'',
next_run:'',
children: child children: child
} }
if(child && child.length > 0){ if(child && child.length > 0){
...@@ -1732,13 +1732,13 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1732,13 +1732,13 @@ export default class MainBase extends Vue implements ControlInterface {
remark:'', remark:'',
handler:'', handler:'',
cron:'', cron:'',
last_run:'',
next_run:'',
last_time:'', last_time:'',
next_time:'', next_time:'',
status:'', status:'',
timeout:'', timeout:'',
update_time:'', update_time:'',
last_run:'',
next_run:'',
children: children, children: children,
} }
groupTree.push(tree); groupTree.push(tree);
......
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
浏览文件 @ 9d2ba5a5
...@@ -51,6 +51,16 @@ export default class MainModel { ...@@ -51,6 +51,16 @@ export default class MainModel {
prop: 'cron', prop: 'cron',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'last_run',
prop: 'last_run',
dataType: 'DATETIME',
},
{
name: 'next_run',
prop: 'next_run',
dataType: 'DATETIME',
},
{ {
name: 'last_time', name: 'last_time',
prop: 'last_time', prop: 'last_time',
...@@ -76,16 +86,6 @@ export default class MainModel { ...@@ -76,16 +86,6 @@ export default class MainModel {
prop: 'update_time', prop: 'update_time',
dataType: 'DATETIME', dataType: 'DATETIME',
}, },
{
name: 'last_run',
prop: 'last_run',
dataType: 'DATETIME',
},
{
name: 'next_run',
prop: 'next_run',
dataType: 'DATETIME',
},
{ {
name: 'srfkey', name: 'srfkey',
prop: 'id', prop: 'id',
......
app_web/src/widgets/jobs-log/main-form/main-form-base.vue
浏览文件 @ 9d2ba5a5
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</i-col> </i-col>
<i-col v-show="detailsModel.trigger_msg.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.trigger_msg.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='trigger_msg' :itemRules="this.rules().trigger_msg" class='' :caption="$t('entities.jobslog.main_form.details.trigger_msg')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.trigger_msg.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='trigger_msg' :itemRules="this.rules().trigger_msg" class='' :caption="$t('entities.jobslog.main_form.details.trigger_msg')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.trigger_msg.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.trigger_msg" :disabled="detailsModel.trigger_msg.disabled" type='textarea' style="" ></input-box> <input-box v-model="data.trigger_msg" :textareaId="this.$util.createUUID()" :disabled="detailsModel.trigger_msg.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
</app-form-item> </app-form-item>
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java
浏览文件 @ 9d2ba5a5
...@@ -196,8 +196,8 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i ...@@ -196,8 +196,8 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
@Override @Override
@Transactional @Transactional
public JobsInfo start(JobsInfo et) { public JobsInfo start(JobsInfo et) {
et.set("Last_time","0");
et.set("Status","0"); et.set("Status","0");
et.set("Last_time","0");
update(et); update(et);
return et; return et;
} }
......
ibztask-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 9d2ba5a5
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!--输出实体[JOBS_INFO]数据结构 --> <!--输出实体[JOBS_INFO]数据结构 -->
<changeSet author="root" id="tab-jobs_info-34-1"> <changeSet author="root" id="tab-jobs_info-37-1">
<createTable tableName="JOBS_INFO"> <createTable tableName="JOBS_INFO">
<column name="ID" remarks="" type="VARCHAR(100)"> <column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/> <constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<!--输出实体[JOBS_LOG]数据结构 --> <!--输出实体[JOBS_LOG]数据结构 -->
<changeSet author="root" id="tab-jobs_log-6-3"> <changeSet author="root" id="tab-jobs_log-7-3">
<createTable tableName="JOBS_LOG"> <createTable tableName="JOBS_LOG">
<column name="ID" remarks="" type="VARCHAR(100)"> <column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_LOG_ID"/> <constraints primaryKey="true" primaryKeyName="PK_JOBS_LOG_ID"/>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或