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

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

@@ -18,7 +18,7 @@ function getLocaleResourceBase(){
 		status: commonLogic.appcommonhandle("状态",null),
 		update_time: commonLogic.appcommonhandle("更新时间",null),
 		create_time: commonLogic.appcommonhandle("创建时间",null),
-		last_time_format: commonLogic.appcommonhandle("上次执行时间",null),
+		last_run: commonLogic.appcommonhandle("上次执行时间",null),
 	},
 		views: {
 			editview: {
@@ -72,7 +72,7 @@ function getLocaleResourceBase(){
 				status: commonLogic.appcommonhandle("状态",null),
 				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
 				update_time: commonLogic.appcommonhandle("更新时间",null),
-				last_time_format: commonLogic.appcommonhandle("上次执行时间",null),
+				last_run: commonLogic.appcommonhandle("上次执行时间",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

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

@@ -18,7 +18,7 @@ function getLocaleResourceBase(){
 		status: commonLogic.appcommonhandle("状态",null),
 		update_time: commonLogic.appcommonhandle("更新时间",null),
 		create_time: commonLogic.appcommonhandle("创建时间",null),
-		last_time_format: commonLogic.appcommonhandle("上次执行时间",null),
+		last_run: commonLogic.appcommonhandle("上次执行时间",null),
 	},
 		views: {
 			editview: {
@@ -72,7 +72,7 @@ function getLocaleResourceBase(){
 				status: commonLogic.appcommonhandle("状态",null),
 				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
 				update_time: commonLogic.appcommonhandle("更新时间",null),
-				last_time_format: commonLogic.appcommonhandle("上次执行时间",null),
+				last_run: commonLogic.appcommonhandle("上次执行时间",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

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

@@ -18,7 +18,7 @@ function getLocaleResourceBase(){
 		status: commonLogic.appcommonhandle("状态",null),
 		update_time: commonLogic.appcommonhandle("更新时间",null),
 		create_time: commonLogic.appcommonhandle("创建时间",null),
-		last_time_format: commonLogic.appcommonhandle("上次执行时间",null),
+		last_run: commonLogic.appcommonhandle("上次执行时间",null),
 	},
 		views: {
 			editview: {
@@ -72,7 +72,7 @@ function getLocaleResourceBase(){
 				status: commonLogic.appcommonhandle("状态",null),
 				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
 				update_time: commonLogic.appcommonhandle("更新时间",null),
-				last_time_format: commonLogic.appcommonhandle("上次执行时间",null),
+				last_run: commonLogic.appcommonhandle("上次执行时间",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

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

@@ -145,15 +145,15 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('last_time_format')">
-                <el-table-column show-overflow-tooltip :prop="'last_time_format'" :label="$t('entities.jobsinfo.main_grid.columns.last_time_format')" :width="200"  :align="'left'" :sortable="'custom'">
+            <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_time_format')}}
+                        {{$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_time_format"></app-format-data>
+                        <app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.last_run"></app-format-data>
                     </template>
                 </el-table-column>
             </template>
@@ -807,9 +807,9 @@ export default class MainBase extends Vue implements ControlInterface {
             enableCond: 3 ,
         },
         {
-            name: 'last_time_format',
+            name: 'last_run',
             label: '上次执行时间',
-            langtag: 'entities.jobsinfo.main_grid.columns.last_time_format',
+            langtag: 'entities.jobsinfo.main_grid.columns.last_run',
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
@@ -1530,7 +1530,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_time_format'];
+        let allColumns:Array<any> = ['id','app','remark','handler','cron','last_time','next_time','status','timeout','update_time','last_run'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1620,7 +1620,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 status:'',
                 timeout:'',
                 update_time:'',
-                last_time_format:'',
+                last_run:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1657,7 +1657,7 @@ export default class MainBase extends Vue implements ControlInterface {
             status:'',
             timeout:'',
             update_time:'',
-            last_time_format:'',
+            last_run:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1714,7 +1714,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 status:'',
                 timeout:'',
                 update_time:'',
-                last_time_format:'',
+                last_run:'',
                 children: children,
             }
             groupTree.push(tree);

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

@@ -77,8 +77,8 @@ export default class MainModel {
           dataType: 'DATETIME',
         },
         {
-          name: 'last_time_format',
-          prop: 'last_time_format',
+          name: 'last_run',
+          prop: 'last_run',
           dataType: 'DATETIME',
         },
         {

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[JOBS_INFO]数据结构 -->
-    <changeSet author="root" id="tab-jobs_info-28-1">
+    <changeSet author="root" id="tab-jobs_info-32-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

@@ -7,7 +7,7 @@
         <![CDATA[select t1.* from (SELECT t1.`APP`, t1.`AUTHOR`, t1.`CREATE_TIME`, t1.`CRON`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`LAST_TIME`, t1.`NEXT_TIME`, t1.`PARAM`, t1.`REMARK`, t1.`STATUS`, t1.`TENANT_ID`, t1.`TIMEOUT`, t1.`UPDATE_TIME` FROM `JOBS_INFO` t1  ) t1 where id=#{id}]]>
     </select>
 	<select id="selectById"  resultMap="JobsInfoResultMap" databaseId="oracle">
-        <![CDATA[select t1.* from (SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.LAST_TIME AS LAST_TIME_FORMAT, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  ) t1 where id=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  ) t1 where id=#{id}]]>
     </select>
 	<select id="selectById"  resultMap="JobsInfoResultMap" databaseId="postgresql">
         <![CDATA[select t1.* from (SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  ) t1 where id=#{id}]]>
@@ -22,7 +22,7 @@
 		<result property="nextTime" column="next_time" />
 		<result property="updateTime" column="update_time" />
 		<result property="createTime" column="create_time" />
-		<result property="lastTimeFormat" column="last_time_format" />
+		<result property="lastRun" column="last_run" />
             
 		
     </resultMap>
@@ -44,7 +44,7 @@
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="oracle">
-		<![CDATA[ SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.LAST_TIME AS LAST_TIME_FORMAT, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
+		<![CDATA[ SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
 			]]>
     </sql>
     <!--数据查询[Default]-->
@@ -59,7 +59,7 @@
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="oracle">
-		<![CDATA[ SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.LAST_TIME AS LAST_TIME_FORMAT, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
+		<![CDATA[ SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
 			]]>
     </sql>
     <!--数据查询[View]-->

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

@@ -218,15 +218,14 @@
     "major_field":0
     },
     {
-    "fieldname":"LAST_TIME_FORMAT" ,
-    "codename":"Last_time_format",
+    "fieldname":"LAST_RUN" ,
+    "codename":"Last_run",
     "field_logic_name":"上次执行时间",
     "entity_name":"JOBS_INFO",
     "field_type":"DATETIME",
     "nullable":1,
     "physical_field":0,
     "data_type":"DATETIME",
-    "expression":"%1$s",
     "key_field":0,
     "show_order":1000,
     "major_field":0