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

app_web/src/locale/lanres/entities/jobs-info/jobs-info_BO_CN_base.ts

@@ -19,6 +19,7 @@ function getLocaleResourceBase(){
 		update_time: commonLogic.appcommonhandle("更新时间",null),
 		create_time: commonLogic.appcommonhandle("创建时间",null),
 		last_run: commonLogic.appcommonhandle("上次执行时间",null),
+		next_run: commonLogic.appcommonhandle("下次执行时间",null),
 	},
 		views: {
 			editview: {
@@ -73,6 +74,7 @@ function getLocaleResourceBase(){
 				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
 				update_time: commonLogic.appcommonhandle("更新时间",null),
 				last_run: commonLogic.appcommonhandle("上次执行时间",null),
+				next_run: commonLogic.appcommonhandle("下次执行时间",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US_base.ts

@@ -19,6 +19,7 @@ function getLocaleResourceBase(){
 		update_time: commonLogic.appcommonhandle("更新时间",null),
 		create_time: commonLogic.appcommonhandle("创建时间",null),
 		last_run: commonLogic.appcommonhandle("上次执行时间",null),
+		next_run: commonLogic.appcommonhandle("下次执行时间",null),
 	},
 		views: {
 			editview: {
@@ -73,6 +74,7 @@ function getLocaleResourceBase(){
 				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
 				update_time: commonLogic.appcommonhandle("更新时间",null),
 				last_run: commonLogic.appcommonhandle("上次执行时间",null),
+				next_run: commonLogic.appcommonhandle("下次执行时间",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN_base.ts

@@ -19,6 +19,7 @@ function getLocaleResourceBase(){
 		update_time: commonLogic.appcommonhandle("更新时间",null),
 		create_time: commonLogic.appcommonhandle("创建时间",null),
 		last_run: commonLogic.appcommonhandle("上次执行时间",null),
+		next_run: commonLogic.appcommonhandle("下次执行时间",null),
 	},
 		views: {
 			editview: {
@@ -73,6 +74,7 @@ function getLocaleResourceBase(){
 				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
 				update_time: commonLogic.appcommonhandle("更新时间",null),
 				last_run: commonLogic.appcommonhandle("上次执行时间",null),
+				next_run: commonLogic.appcommonhandle("下次执行时间",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue

@@ -157,6 +157,18 @@
                     </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">
                 <el-table-column></el-table-column>
             </template>
@@ -815,6 +827,15 @@ export default class MainBase extends Vue implements ControlInterface {
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
+        {
+            name: 'next_run',
+            label: '下次执行时间',
+            langtag: 'entities.jobsinfo.main_grid.columns.next_run',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
     ]
 
     /**
@@ -1530,7 +1551,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     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'];
+        let allColumns:Array<any> = ['id','app','remark','handler','cron','last_time','next_time','status','timeout','update_time','last_run','next_run'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1621,6 +1642,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 timeout:'',
                 update_time:'',
                 last_run:'',
+                next_run:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1658,6 +1680,7 @@ export default class MainBase extends Vue implements ControlInterface {
             timeout:'',
             update_time:'',
             last_run:'',
+            next_run:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1715,6 +1738,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 timeout:'',
                 update_time:'',
                 last_run:'',
+                next_run:'',
                 children: children,
             }
             groupTree.push(tree);

app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts

@@ -81,6 +81,11 @@ export default class MainModel {
           prop: 'last_run',
           dataType: 'DATETIME',
         },
+        {
+          name: 'next_run',
+          prop: 'next_run',
+          dataType: 'DATETIME',
+        },
         {
           name: 'srfkey',
           prop: 'id',

ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java

@@ -196,8 +196,8 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
     @Override
     @Transactional
     public JobsInfo start(JobsInfo et) {
-        et.set("Status","0");
         et.set("Last_time","0");
+        et.set("Status","0");
         update(et);
         return et;
     }

ibztask-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[JOBS_INFO]数据结构 -->
-    <changeSet author="root" id="tab-jobs_info-32-1">
+    <changeSet author="root" id="tab-jobs_info-34-1">
         <createTable tableName="JOBS_INFO">
                 <column name="ID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/>

ibztask-core/src/main/resources/mapper/task/jobsinfo/JobsInfoMapper.xml

@@ -23,6 +23,7 @@
 		<result property="updateTime" column="update_time" />
 		<result property="createTime" column="create_time" />
 		<result property="lastRun" column="last_run" />
+		<result property="nextRun" column="next_run" />
             
 		
     </resultMap>

ibztask-core/src/main/resources/sysmodel/ibztask.json

@@ -229,6 +229,19 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"NEXT_RUN" ,
+    "codename":"Next_run",
+    "field_logic_name":"下次执行时间",
+    "entity_name":"JOBS_INFO",
+    "field_type":"DATETIME",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[