Merge pull request #301 from dataease/pr@dev@task

feat: 调整定时任务

backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml

@@ -16,6 +16,7 @@
         SELECT dataset_table_task_log.*, dataset_table_task.name
         FROM dataset_table_task_log
         LEFT JOIN dataset_table_task ON dataset_table_task_log.task_id = dataset_table_task.id
+        LEFT JOIN dataset_table ON dataset_table_task_log.table_id = dataset_table.id
         <if test="_parameter != null">
             <include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
         </if>

backend/src/main/java/io/dataease/commons/constants/TaskStatus.java

@@ -1,5 +1,5 @@
 package io.dataease.commons.constants;
 
 public enum TaskStatus {
-    Underway, Stopped
+    Underway, Stopped, Pending, Exec
 }

backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java

@@ -11,7 +11,7 @@ public class MysqlConfigration extends JdbcDTO {
 
     public String getJdbc() {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
-        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8"
+        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8&connectTimeout=5000&socketTimeout=5000"
                 .replace("HOSTNAME", getHost())
                 .replace("PORT", getPort().toString())
                 .replace("DATABASE", getDataBase());

backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java

@@ -401,6 +401,7 @@ public class JdbcProvider extends DatasourceProvider {
         String driver = null;
         String jdbcurl = null;
         DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType());
+        Properties props = new Properties();
         switch (datasourceType) {
             case mysql:
                 MysqlConfigration mysqlConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfigration.class);
@@ -429,13 +430,14 @@ public class JdbcProvider extends DatasourceProvider {
                 password = oracleConfigration.getPassword();
                 driver = oracleConfigration.getDriver();
                 jdbcurl = oracleConfigration.getJdbc();
+                props.put( "oracle.net.CONNECT_TIMEOUT" , "5000") ;
+                props.put( "oracle.jdbc.ReadTimeout" , "5000" ) ;
                 break;
             default:
                 break;
         }
 
         Class.forName(driver);
-        Properties props = new Properties();
         props.setProperty("user", username);
         if (StringUtils.isNotBlank(password)) {
             props.setProperty("password", password);

backend/src/main/java/io/dataease/datasource/service/DatasourceService.java

@@ -120,6 +120,13 @@ public class DatasourceService {
         datasourceProvider.checkStatus(datasourceRequest);
     }
 
+    public void validate(String datasourceId) throws Exception {
+        if(StringUtils.isEmpty(datasourceId)){
+            return;
+        }
+        Datasource datasource = datasourceMapper.selectByPrimaryKey(datasourceId);
+        validate(datasource);
+    }
     public List<String> getSchema(Datasource datasource) throws Exception {
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
         DatasourceRequest datasourceRequest = new DatasourceRequest();
@@ -132,6 +139,7 @@ public class DatasourceService {
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(ds);
+        datasourceProvider.checkStatus(datasourceRequest);
         List<String> tables = datasourceProvider.getTables(datasourceRequest);
 
         // 获取当前数据源下的db类型数据集

backend/src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java

@@ -15,4 +15,5 @@ public class DataSetTaskDTO extends DatasetTableTask {
     private String datasetName;
     private Long nextExecTime;
     private String taskStatus;
+    private String msg;
 }

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -1392,9 +1392,8 @@ public class DataSetTableService {
         List<String> taskIds = datasetTableTaskLogMapper.selectByExample(datasetTableTaskLogExample).stream().map(DatasetTableTaskLog::getTaskId).collect(Collectors.toList());
         datasetTableTaskLogMapper.updateByExampleSelective(datasetTableTaskLog, datasetTableTaskLogExample);
 
-        DatasetTableTask datasetTableTask = new DatasetTableTask();
+        dataSetTableTaskService.updateTaskStatus(taskIds, JobStatus.Error);
-        datasetTableTask.setLastExecStatus(JobStatus.Error.name());
+        //TODO check task status
-        dataSetTableTaskService.update(taskIds, datasetTableTask);
 
         for (DatasetTable jobStoppeddDatasetTable : jobStoppeddDatasetTables) {
             extractDataService.deleteFile("all_scope", jobStoppeddDatasetTable.getId());

backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java

@@ -95,6 +95,7 @@ public class DataSetTableTaskLogService {
         if(CollectionUtils.isNotEmpty(datasetTableTaskLogs)){
             dataSetTaskDTO.setLastExecStatus(datasetTableTaskLogs.get(0).getStatus());
             dataSetTaskDTO.setLastExecTime(datasetTableTaskLogs.get(0).getCreateTime());
+            dataSetTaskDTO.setMsg(datasetTableTaskLogs.get(0).getInfo());
         }
         return dataSetTaskDTO;
     }

backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java

@@ -5,6 +5,7 @@ import io.dataease.base.domain.*;
 import io.dataease.base.mapper.DatasetTableMapper;
 import io.dataease.base.mapper.DatasetTableTaskMapper;
 import io.dataease.base.mapper.ext.ExtDataSetTaskMapper;
+import io.dataease.base.mapper.ext.UtilMapper;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.commons.constants.JobStatus;
 import io.dataease.commons.constants.ScheduleType;
@@ -48,12 +49,11 @@ public class DataSetTableTaskService {
     @Lazy
     private DataSetTableService dataSetTableService;
     @Resource
-    private ExtractDataService extractDataService;
-    @Resource
     private ExtDataSetTaskMapper extDataSetTaskMapper;
     @Resource
     private DatasetTableMapper datasetTableMapper;
-
+    @Resource
+    private UtilMapper utilMapper;
 
     public DatasetTableTask save(DataSetTaskRequest dataSetTaskRequest) throws Exception {
         checkName(dataSetTaskRequest);
@@ -82,22 +82,21 @@ public class DataSetTableTaskService {
         if (StringUtils.isEmpty(datasetTableTask.getId())) {
             datasetTableTask.setId(UUID.randomUUID().toString());
             datasetTableTask.setCreateTime(System.currentTimeMillis());
+            if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), ScheduleType.SIMPLE.toString())){
+                datasetTableTask.setStatus(TaskStatus.Exec.name());
+            }else {
                 datasetTableTask.setStatus(TaskStatus.Underway.name());
+            }
             datasetTableTaskMapper.insert(datasetTableTask);
         } else {
             datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
         }
 
         // simple
-        if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString()) && datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Underway.name())) { // SIMPLE 类型，提前占位
+        if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { // SIMPLE 类型，提前占位
             execNow(datasetTableTask);
-            scheduleService.addSchedule(datasetTableTask);
         }
-        //cron、simple_cron
-        if(!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.name())){
         scheduleService.addSchedule(datasetTableTask);
-        }
-
         return datasetTableTask;
     }
 
@@ -122,6 +121,7 @@ public class DataSetTableTaskService {
         if(!existSyncTask){
             datasetTableTask.setLastExecTime(System.currentTimeMillis());
             datasetTableTask.setLastExecStatus(JobStatus.Underway.name());
+            datasetTableTask.setStatus(TaskStatus.Exec.name());
             update(datasetTableTask);
             DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
             datasetTableTaskLog.setTableId(datasetTableTask.getTableId());
@@ -159,17 +159,36 @@ public class DataSetTableTaskService {
         return datasetTableTaskMapper.selectByPrimaryKey(id);
     }
 
-    public void update(DatasetTableTask datasetTableTask) {
+    public void updateTaskStatus(List<String> taskIds, JobStatus lastExecStatus) {
-        datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
-    }
-
-    public void update(List<String> taskIds, DatasetTableTask datasetTableTask) {
         if (CollectionUtils.isEmpty(taskIds)){
             return;
         }
         DatasetTableTaskExample example = new DatasetTableTaskExample();
         example.createCriteria().andIdIn(taskIds);
-        datasetTableTaskMapper.updateByExampleSelective(datasetTableTask, example);
+        List<DatasetTableTask>  datasetTableTasks = datasetTableTaskMapper.selectByExample(example);
+        for (DatasetTableTask tableTask : datasetTableTasks) {
+            updateTaskStatus(tableTask, lastExecStatus);
+        }
+    }
+
+    public void updateTaskStatus(DatasetTableTask datasetTableTask, JobStatus lastExecStatus){
+        datasetTableTask.setLastExecStatus(lastExecStatus.name());
+        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.name())){
+            datasetTableTask.setStatus(TaskStatus.Stopped.name());
+        }else {
+            if(StringUtils.isNotEmpty(datasetTableTask.getEnd()) && datasetTableTask.getEnd().equalsIgnoreCase("1")){
+                if(utilMapper.currentTimestamp() > datasetTableTask.getEndTime()){
+                    datasetTableTask.setStatus(TaskStatus.Stopped.name());
+                }
+            }else {
+                datasetTableTask.setStatus(TaskStatus.Underway.name());
+            }
+        }
+        update(datasetTableTask);
+    }
+
+    public void update(DatasetTableTask datasetTableTask) {
+        datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
     }
 
     public List<DatasetTableTask> list(DatasetTableTask datasetTableTask) {
@@ -217,12 +236,11 @@ public class DataSetTableTaskService {
 
     public void execTask(DatasetTableTask datasetTableTask) throws Exception{
         execNow(datasetTableTask);
-        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.CRON.toString())){
+        if(!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
             scheduleService.fireNow(datasetTableTask);
         }
-        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
+//        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
-            scheduleService.addSchedule(datasetTableTask);
+//            scheduleService.addSchedule(datasetTableTask);
-        }
+//        }
-
     }
 }

backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java

@@ -6,6 +6,7 @@ import io.dataease.base.mapper.DatasetTableMapper;
 import io.dataease.base.mapper.DatasetTableTaskMapper;
 import io.dataease.base.mapper.DatasourceMapper;
 import io.dataease.base.mapper.ext.ExtChartViewMapper;
+import io.dataease.base.mapper.ext.UtilMapper;
 import io.dataease.commons.constants.*;
 import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.*;
@@ -15,6 +16,7 @@ import io.dataease.datasource.provider.DatasourceProvider;
 import io.dataease.datasource.provider.JdbcProvider;
 import io.dataease.datasource.provider.ProviderFactory;
 import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.datasource.service.DatasourceService;
 import io.dataease.dto.dataset.DataTableInfoDTO;
 import io.dataease.exception.DataEaseException;
 import io.dataease.listener.util.CacheUtils;
@@ -90,9 +92,12 @@ public class ExtractDataService {
     private DatasetTableMapper datasetTableMapper;
     @Resource
     private DatasetTableTaskMapper datasetTableTaskMapper;
-
+    @Resource
+    private DatasourceService datasourceService;
     @Resource
     private ExtChartViewMapper extChartViewMapper;
+    @Resource
+    private UtilMapper utilMapper;
 
     private static String lastUpdateTime = "${__last_update_time__}";
     private static String currentUpdateTime = "${__current_update_time__}";
@@ -147,6 +152,7 @@ public class ExtractDataService {
         }else {
             datasetTableTask.setLastExecTime(System.currentTimeMillis());
             datasetTableTask.setLastExecStatus(JobStatus.Underway.name());
+            datasetTableTask.setStatus(TaskStatus.Exec.name());
             dataSetTableTaskService.update(datasetTableTask);
             return false;
         }
@@ -189,12 +195,12 @@ public class ExtractDataService {
                     extractData(datasetTable, "all_scope");
                     replaceTable(DorisTableUtils.dorisName(datasetTableId));
                     saveSucessLog(datasetTableTaskLog);
-                    sendWebMsg(datasetTable, null, true);
+//                    sendWebMsg(datasetTable, null, true);
                     deleteFile("all_scope", datasetTableId);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime);
                 } catch (Exception e) {
                     saveErrorLog(datasetTableId, null, e);
-                    sendWebMsg(datasetTable, null, false);
+//                    sendWebMsg(datasetTable, null, false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
                     dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)));
                     deleteFile("all_scope", datasetTableId);
@@ -241,7 +247,7 @@ public class ExtractDataService {
         if(datasetTableTask == null){
             return;
         }
-        if(datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Stopped.name())){
+        if(datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Stopped.name())|| datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Pending.name())){
             LogUtil.info("Skip synchronization task, task ID : " + datasetTableTask.getId());
             return;
         }
@@ -301,13 +307,13 @@ public class ExtractDataService {
                     deleteFile("all_scope", datasetTableId);
 
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime);
-                    datasetTableTask.setLastExecStatus(JobStatus.Completed.name());
+
-                    dataSetTableTaskService.update(datasetTableTask);
+                    dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Completed);
 
                 }catch (Exception e){
                     saveErrorLog(datasetTableId, taskId, e);
-                    datasetTableTask.setLastExecStatus(JobStatus.Error.name());
+
-                    dataSetTableTaskService.update(datasetTableTask);
+                    dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error);
 
                     sendWebMsg(datasetTable, taskId,false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
@@ -360,17 +366,22 @@ public class ExtractDataService {
                     deleteFile("incremental_delete", datasetTableId);
 
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime);
-                    datasetTableTask.setLastExecStatus(JobStatus.Completed.name());
+
-                    dataSetTableTaskService.update(datasetTableTask);
+                    dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Completed);
                 }catch (Exception e){
                     saveErrorLog(datasetTableId, taskId, e);
                     sendWebMsg(datasetTable, taskId,false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
-                    datasetTableTask.setLastExecStatus(JobStatus.Error.name());
+
-                    dataSetTableTaskService.update(datasetTableTask);
+                    dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error);
+
                     deleteFile("incremental_add", datasetTableId);
                     deleteFile("incremental_delete", datasetTableId);
                 }finally {
+                    if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
+                        datasetTableTask.setStatus(TaskStatus.Stopped.name());
+                        dataSetTableTaskService.update(datasetTableTask);
+                    }
                 }
                 break;
         }
@@ -549,6 +560,7 @@ public class ExtractDataService {
     }
 
     private void extractData(DatasetTable datasetTable, String extractType) throws Exception {
+        datasourceService.validate(datasetTable.getDataSourceId());
         KettleFileRepository repository = CommonBeanFactory.getBean(KettleFileRepository.class);
         RepositoryDirectoryInterface repositoryDirectoryInterface = repository.loadRepositoryDirectoryTree();
         JobMeta jobMeta = null;

backend/src/main/resources/db/migration/V13__system_task.sql

@@ -1,15 +1,26 @@
-INSERT INTO `sys_menu` VALUES (57, 1, 3, 1, '任务管理', 'sys-task', 'system/task/index', 2000,  'task', 'system-task', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sys_menu` VALUES (58, 1, 0, 1, 'i18n_timed_task', 'sys-task-dataset', 'system/task/dataset', 1001,  'task', 'dataset', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `sys_menu` VALUES (58, 57, 0, 1, '数据集任务', 'sys-task-dataset', 'system/task/dataset', 1,  'task', 'dataset', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
+
 ALTER TABLE `dataset_table_task`
     ADD COLUMN `last_exec_time` BIGINT(13) NULL DEFAULT NULL COMMENT '上次执行时间' AFTER `create_time`,
     ADD COLUMN `status` VARCHAR(50) NULL DEFAULT NULL COMMENT '任务状态' AFTER `last_exec_time`,
     ADD COLUMN `last_exec_status` VARCHAR(50) NULL DEFAULT NULL COMMENT '上次执行结果' AFTER `last_exec_time`;
 
-update dataset_table_task set status='Underway';
 update dataset_table_task set rate='SIMPLE' where rate='SIMPLE_COMPLETE';
 
+update dataset_table_task set status='Stopped' where rate='SIMPLE';
+update dataset_table_task set status='Underway' where rate='CRON';
+
+
+UPDATE dataset_table_task
+SET dataset_table_task.last_exec_time = (SELECT dataset_table_task_log.start_time FROM dataset_table_task_log WHERE dataset_table_task_log.task_id = dataset_table_task.id limit 1);
+
+UPDATE dataset_table_task
+SET dataset_table_task.last_exec_status = (SELECT dataset_table_task_log.status FROM dataset_table_task_log WHERE dataset_table_task_log.task_id = dataset_table_task.id limit 1);
+
 
 ALTER TABLE `dataset_table_task_log` ADD COLUMN `trigger_type` VARCHAR(45) NULL AFTER `create_time`;
+ALTER TABLE `dataset_table_task` ADD COLUMN `extra_data` LONGTEXT NULL AFTER `last_exec_status`;
+
 update dataset_table_task_log set trigger_type='Cron';
 
-ALTER TABLE `dataset_table_task` ADD COLUMN `extra_data` LONGTEXT NULL AFTER `last_exec_status`;
+

backend/src/main/resources/i18n/messages_en_US.properties

@@ -274,3 +274,4 @@ i18n_msg_type_dataset_sync_success=Dataset synchronization successful
 i18n_msg_type_dataset_sync_faild=Dataset synchronization failed
 i18n_data_not_sync=Please sync data first
 i18n_excel_colume_change=The column name of Excel is inconsistent with the original data set
+i18n_timed_task=Timed Task

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -273,3 +273,4 @@ i18n_msg_type_dataset_sync_success=数据集同步成功
 i18n_msg_type_dataset_sync_faild=数据集同步失败
 i18n_data_not_sync=请先完成数据同步
 i18n_excel_colume_change=Excel的列名与原数据集不一致
+i18n_timed_task=定时任务

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -276,3 +276,4 @@ i18n_msg_type_dataset_sync_success=數據集同步成功
 i18n_msg_type_dataset_sync_faild=數據集同步失敗
 i18n_data_not_sync=請先完成數據同步
 i18n_excel_colume_change=Excel的列名與原數據集不一致
+i18n_timed_task=定時任務

frontend/src/lang/en.js

@@ -827,6 +827,7 @@ export default {
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
     datalist: 'Data Set',
+    name: 'DataSet Name',
     add_group: 'Add Group',
     add_scene: 'Add Scene',
     group: 'Group',
@@ -961,9 +962,10 @@ export default {
       task_status: 'Task status',
       dataset: 'Data set',
       search_by_name: 'Search by name',
-      underway: 'Running',
+      underway: 'Waiting for execution',
-      stopped: 'Stopped',
+      stopped: 'End',
-      exec: 'Execute',
+      pending: 'Pause',
+      exec: 'Execute Once',
       confirm_exec: 'Manual trigger execution？',
       change_success: 'State switch successful'
     },

frontend/src/lang/tw.js

@@ -827,6 +827,7 @@ export default {
   dataset: {
     sheet_warn: '有多個sheet頁面，默認抽取第一個',
     datalist: '數據集',
+    name: '數據集名稱',
     add_group: '添加分組',
     add_scene: '添加場景',
     group: '分組',
@@ -961,9 +962,10 @@ export default {
       task_status: '任務狀態',
       dataset: '數據集',
       search_by_name: '根據名稱搜索',
-      underway: '運行中',
+      underway: '等待執行',
-      stopped: '停止',
+      stopped: '執行结束',
-      exec: '執行',
+      pending: '暫停',
+      exec: '執行一次',
       confirm_exec: '手動觸發執行？',
       change_success: '狀態切換成功'
     },

frontend/src/lang/zh.js

@@ -827,6 +827,7 @@ export default {
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
     datalist: '数据集',
+    name: '数据集名称',
     add_group: '添加分组',
     add_scene: '添加场景',
     group: '分组',
@@ -961,9 +962,10 @@ export default {
       task_status: '任务状态',
       dataset: '数据集',
       search_by_name: '根据名称搜索',
-      underway: '运行中',
+      underway: '等待执行',
-      stopped: '停止',
+      stopped: '执行结束',
-      exec: '执行',
+      pending: '暂停',
+      exec: '执行一次',
       confirm_exec: '手动触发执行？',
       change_success: '状态切换成功'
     },

frontend/src/views/dataset/group/Group.vue

@@ -100,7 +100,7 @@
                               <svg-icon icon-class="ds-sql" class="ds-icon-sql" />
                               {{ $t('dataset.sql_data') }}
                             </el-dropdown-item>
-                            <el-dropdown-item :command="beforeClickAddData('excel',data)">
+                            <el-dropdown-item :command="beforeClickAddData('excel',data)" :disabled="!kettleRunning">
                               <svg-icon icon-class="ds-excel" class="ds-icon-excel" />
                               {{ $t('dataset.excel_data') }}
                             </el-dropdown-item>
@@ -341,7 +341,7 @@
 </template>
 
 <script>
-import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post } from '@/api/dataset/dataset'
+import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post , isKettleRunning} from '@/api/dataset/dataset'
 import { authModel } from '@/api/system/sysAuth'
 import GroupMoveSelector from './GroupMoveSelector'
 import DsMoveSelector from './DsMoveSelector'
@@ -415,7 +415,8 @@ export default {
         id: 'id',
         parentId: 'pid'
       },
-      isTreeSearch: false
+      isTreeSearch: false,
+      kettleRunning: false
     }
   },
   computed: {
@@ -426,6 +427,9 @@ export default {
     //   return this.$store.state.dataset.sceneData
     // }
   },
+  created() {
+    this.kettleState()
+  },
   watch: {
     search(val) {
       // if (val && val !== '') {
@@ -467,7 +471,11 @@ export default {
         'node': node
       }
     },
-
+    kettleState() {
+      isKettleRunning().then(res => {
+        this.kettleRunning = res.data
+      })
+    },
     clickMore(param) {
       // console.log(param)
       switch (param.type) {

frontend/src/views/system/task/DatasetTaskList.vue

@@ -6,7 +6,13 @@
           <el-button  icon="el-icon-circle-plus-outline" @click="selectDataset">{{ $t('dataset.task.create') }}</el-button>
         </template>
 
-        <el-table-column prop="name" :label="$t('dataset.task_name')" />
+        <el-table-column prop="name" :label="$t('dataset.task_name')" >
+          <template slot-scope="scope">
+            <span>
+              <el-link style="font-size: 12px" @click="jumpTaskRecord(scope.row)">{{ scope.row.name }}</el-link>
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column prop="datasetName" :label="$t('dataset.task.dataset')" />
         <el-table-column prop="rate" :label="$t('dataset.execute_rate')">
           <template slot-scope="scope">
@@ -21,7 +27,7 @@
             <span v-if="scope.row.lastExecTime && scope.row.lastExecTime != -1">
             {{ scope.row.lastExecTime | timestampFormatDate }}
           </span>
-            <span v-if="scope.row.lastExecTime === -1">--</span>
+            <span v-if="scope.row.lastExecTime === -1"></span>
           </template>
         </el-table-column>
 
@@ -32,18 +38,19 @@
                 <i class="el-icon-loading" />
                 {{ $t('dataset.underway') }}
             </span>
-            <span v-if="scope.row.lastExecStatus === 'Error'" style="color: #ff0000">
+            <span v-if="scope.row.lastExecStatus === 'Error'" style="color: red">
-            {{ $t('dataset.error') }}
+              <el-link type="danger" style="font-size: 12px" @click="showErrorMassage(scope.row.msg)">{{ $t('dataset.error') }}</el-link>
             </span>
+
           </template>
         </el-table-column>
 
         <el-table-column prop="nextExecTime" :label="$t('dataset.task.next_exec_time')">
           <template slot-scope="scope" >
-            <span v-if="scope.row.nextExecTime">
+            <span v-if="scope.row.nextExecTime && scope.row.rate !== 'SIMPLE'">
               {{ scope.row.nextExecTime | timestampFormatDate }}
             </span>
-            <span v-if="!scope.row.nextExecTime">--</span>
+            <span v-if="!scope.row.nextExecTime || scope.row.rate === 'SIMPLE'"></span>
           </template>
 
         </el-table-column>
@@ -53,8 +60,15 @@
             <span v-if="scope.row.status === 'Underway'" style="color: green">
               <el-link type="success" style="font-size: 12px" @click="changeTaskStatus(scope.row)">{{ $t('dataset.task.underway') }}</el-link>
             </span>
-            <span v-if="scope.row.status === 'Stopped'">
+            <span v-if="scope.row.status === 'Stopped'" style="color: red">
-              <el-link type="danger" style="font-size: 12px" @click="changeTaskStatus(scope.row)">{{ $t('dataset.task.stopped') }}</el-link>
+              <div type="danger" style="font-size: 12px">{{ $t('dataset.task.stopped') }}</div>
+            </span>
+            <span v-if="scope.row.status === 'Pending'" style="color: blue">
+              <el-link type="primary" style="font-size: 12px" @click="changeTaskStatus(scope.row)">{{ $t('dataset.task.pending') }}</el-link>
+            </span>
+            <span v-if="scope.row.status === 'Exec'" style="color: blue">
+                <i class="el-icon-loading" />
+                {{ $t('dataset.underway') }}
             </span>
           </template>
         </el-table-column>
@@ -110,10 +124,10 @@
             </el-form>
           </el-form-item>
 
-          <el-form-item v-if="taskForm.rate === 'CRON'" :label="$t('dataset.start_time')" prop="startTime">
+          <el-form-item v-if="taskForm.rate !== 'SIMPLE'" :label="$t('dataset.start_time')" prop="startTime">
             <el-date-picker v-model="taskForm.startTime" type="datetime" :placeholder="$t('dataset.select_data_time')" size="mini"/>
           </el-form-item>
-          <el-form-item v-if="taskForm.rate === 'CRON'" :label="$t('dataset.end_time')" prop="end">
+          <el-form-item v-if="taskForm.rate !== 'SIMPLE'" :label="$t('dataset.end_time')" prop="end">
             <el-select v-model="taskForm.end" size="mini">
               <el-option :label="$t('dataset.no_limit')" value="0"/>
               <el-option :label="$t('dataset.set_end_time')" value="1"/>
@@ -154,7 +168,7 @@
     </el-dialog>
 
     <!--添加任务-选择数据集-->
-    <el-dialog v-dialogDrag :title="$t('chart.add_chart')" :visible="selectDatasetFlag" :show-close="false" width="70%" class="dialog-css" :destroy-on-close="true">
+    <el-dialog v-dialogDrag :title="$t('dataset.task.create')" :visible="selectDatasetFlag" :show-close="false" width="70%" class="dialog-css" :destroy-on-close="true">
       <table-selector @getTable="getTable" :mode="1" type="db"  showMode="datasetTask"/>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeCreateTask">{{ $t('chart.cancel') }}</el-button>
@@ -162,6 +176,19 @@
       </div>
     </el-dialog>
 
+    <el-dialog
+      v-dialogDrag
+      :title="$t('dataset.detail')"
+      :visible="show_error_massage"
+      :show-close="false"
+      width="50%"
+      class="dialog-css"
+    >
+      <span class="err-msg">{{ error_massage }}</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="show_error_massage = false">{{ $t('dataset.close') }}</el-button>
+      </span>
+    </el-dialog>
   </el-col>
 </template>
 
@@ -194,6 +221,12 @@ import TableSelector from '@/views/chart/view/TableSelector'
 export default {
   name: 'DatasetTaskList',
   components: { ComplexTable, cron, codemirror, TableSelector },
+  props: {
+    param: {
+      type: Object,
+      default: null
+    }
+  },
   data() {
     return {
       taskForm: {
@@ -228,8 +261,11 @@ export default {
         useComplexSearch: true,
         quickPlaceholder: this.$t('dataset.task.search_by_name'),
         components: [
-          { field: 'dataset_table_task.name', label: this.$t('dataset.task.name'), component: 'DeComplexInput' },
+          { field: 'dataset_table.name', label: this.$t('dataset.name'), component: 'DeComplexInput' },
-          { field: 'dataset_table_task.last_exec_status', label: this.$t('commons.status'), component: 'FuComplexSelect', options: [{ label: this.$t('dataset.completed'), value: 'Completed' }, { label: this.$t('dataset.underway'), value: 'Underway' }, { label: this.$t('dataset.error'), value: 'Error' }], multiple: false }
+          { field: 'dataset_table_task.name', label: this.$t('dataset.task_name'), component: 'DeComplexInput' },
+          { field: 'dataset_table_task.status', label: this.$t('dataset.task.task_status'), component: 'FuComplexSelect',
+            options: [{ label: this.$t('dataset.task.stopped'), value: 'Stopped' }, { label: this.$t('dataset.task.underway'), value: 'Underway' }, { label: this.$t('dataset.task.pending'), value: 'Pending' }, { label: this.$t('dataset.underway'), value: 'Exec' }], multiple: false },
+          { field: 'dataset_table_task.last_exec_status', label: this.$t('dataset.task.last_exec_status'), component: 'FuComplexSelect', options: [{ label: this.$t('dataset.completed'), value: 'Completed' }, { label: this.$t('dataset.underway'), value: 'Underway' }, { label: this.$t('dataset.error'), value: 'Error' }], multiple: false }
         ]
       },
       paginationConfig: {
@@ -279,7 +315,9 @@ export default {
       cronEdit: false,
       lang: this.$store.getters.language === 'en_US' ? 'en' : 'cn',
       selectDatasetFlag: false,
-      table: {}
+      table: {},
+      show_error_massage: false,
+      error_massage: ''
     }
   },
   computed: {
@@ -288,7 +326,19 @@ export default {
     }
   },
   created() {
+    if(this.param == null){
+      this.last_condition = {}
       this.search()
+    }else {
+      this.last_condition = {
+        'dataset_table_task.name': {
+          field: "dataset_table_task.name",
+          operator: "eq",
+          value: this.param.name
+        }
+      }
+      this.search(this.last_condition)
+    }
     this.timer = setInterval(() => {
       this.search(this.last_condition, false)
     }, 5000)
@@ -338,6 +388,7 @@ export default {
         if(!item.lastExecTime) {
           item.lastExecTime = response.data.lastExecTime
         }
+        item.msg = response.data.msg
       })
     },
     create(task) {
@@ -356,7 +407,7 @@ export default {
     },
     changeTaskStatus(task){
       const param = task;
-      param.status = task.status === 'Underway' ? 'Stopped' : 'Underway'
+      param.status = task.status === 'Underway' ? 'Pending' : 'Underway'
       post('/dataset/task/updateStatus', task).then(response => {
         task.status = param.status;
         this.$message({
@@ -373,7 +424,7 @@ export default {
         type: 'warning'
       }).then(() => {
         post('/dataset/task/execTask', task).then(response => {
-          this.search()
+          this.search(this.last_condition, true)
         })
       }).catch(() => {
       })
@@ -491,10 +542,10 @@ export default {
       this.taskForm.cron = val
     },
     disableEdit(task) {
-      return task.rate === 'SIMPLE'
+      return task.rate === 'SIMPLE' || task.status === 'Stopped'
     },
     disableExec(task) {
-      return task.status === 'Stopped'
+      return task.status === 'Stopped' || task.status === 'Pending'
     },
     deleteTask(task) {
       this.$confirm(this.$t('dataset.confirm_delete'), this.$t('dataset.tips'), {
@@ -508,7 +559,7 @@ export default {
             type: 'success',
             showClose: true
           })
-          this.search()
+          this.search(this.last_condition, true)
         })
       }).catch(() => {
       })
@@ -542,6 +593,13 @@ export default {
       this.update_task = false
       this.resetTaskForm()
     },
+    showErrorMassage(massage) {
+      this.show_error_massage = true
+      this.error_massage = massage
+    },
+    jumpTaskRecord(item){
+      this.$emit('jumpTaskRecord', item)
+    },
     saveTask(task) {
       if (task.rate !== 'SIMPLE') {
         if (this.incrementalUpdateType === 'incrementalAdd') {
@@ -567,7 +625,7 @@ export default {
         })
         this.update_task = false
         this.resetTaskForm()
-        this.search()
+        this.search(this.last_condition, true)
       })
     },
     handleClose() {
@@ -617,6 +675,16 @@ export default {
   overflow-y: auto;
 }
 
+.err-msg{
+  font-size: 12px;
+  word-break:normal;
+  width:auto;
+  display:block;
+  white-space:pre-wrap;
+  word-wrap : break-word ;
+  overflow: hidden ;
+}
+
 span{
   font-size: 12px;
 }

frontend/src/views/system/task/TaskRecord.vue

@@ -2,7 +2,13 @@
   <el-col>
     <el-row style="margin-top: 10px;">
       <complex-table :data="data" :columns="columns" local-key="datasetTaskRecord" :search-config="searchConfig" :pagination-config="paginationConfig" @select="select" @search="search" @sort-change="sortChange">
-        <el-table-column prop="name" :label="$t('dataset.task_name')" />
+        <el-table-column prop="name" :label="$t('dataset.task_name')">
+          <template slot-scope="scope">
+            <span>
+              <el-link style="font-size: 12px" @click="jumpTask(scope.row)">{{ scope.row.name }}</el-link>
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column prop="startTime" :label="$t('dataset.start_time')">
           <template slot-scope="scope">
             <span>{{ scope.row.startTime | timestampFormatDate }}</span>
@@ -55,7 +61,13 @@ import TableSelector from '@/views/chart/view/TableSelector'
 
 export default {
   name: 'TaskRecord',
-  components: { ComplexTable, LayoutContent, cron, TableSelector },
+  components: { ComplexTable, LayoutContent, cron, TableSelector},
+  props: {
+    param: {
+      type: Object,
+      default: null
+    }
+  },
   data() {
     return {
       header: '',
@@ -71,8 +83,9 @@ export default {
         useComplexSearch: true,
         quickPlaceholder: this.$t('dataset.task.search_by_name'),
         components: [
-          { field: 'dataset_table_task.name', label: this.$t('dataset.task.name'), component: 'DeComplexInput' },
+          { field: 'dataset_table_task.name', label: this.$t('dataset.task_name'), component: 'DeComplexInput' },
-          { field: 'dataset_table_task_log.status', label: this.$t('commons.status'), component: 'FuComplexSelect', options: [{ label: this.$t('dataset.completed'), value: 'Completed' }, { label: this.$t('dataset.underway'), value: 'Underway' }, { label: this.$t('dataset.error'), value: 'Error' }], multiple: false }
+          { field: 'dataset_table.name', label: this.$t('dataset.name'), component: 'DeComplexInput' },
+          { field: 'dataset_table_task_log.status', label: this.$t('commons.status'), component: 'FuComplexSelect', options: [{ label: this.$t('dataset.completed'), value: 'Completed' }, { label: this.$t('dataset.underway'), value: 'Underway' }, { label: this.$t('dataset.error'), value: 'Error' }], multiple: false}
         ]
       },
       paginationConfig: {
@@ -105,7 +118,20 @@ export default {
   computed: {
   },
   created() {
+    if(this.param == null){
+      this.last_condition = {}
       this.search()
+    }else {
+      this.last_condition = {
+        'dataset_table_task.name': {
+            field: "dataset_table_task.name",
+            operator: "eq",
+            value: this.param.name
+        }
+      }
+     this.search(this.last_condition)
+    }
+
     this.timer = setInterval(() => {
       this.search(this.last_condition, false)
     }, 5000)
@@ -145,13 +171,13 @@ export default {
     },
     select(selection) {
     },
-    search(condition) {
+    search(condition, showLoading = true) {
       this.last_condition = condition
       condition = formatQuickCondition(condition, 'dataset_table_task.name')
       const temp = formatCondition(condition)
       const param = temp || {}
       param['orders'] = formatOrders(this.orderConditions)
-      post('/dataset/taskLog/list/' + this.paginationConfig.currentPage + '/' + this.paginationConfig.pageSize, param).then(response => {
+      post('/dataset/taskLog/list/' + this.paginationConfig.currentPage + '/' + this.paginationConfig.pageSize, param, showLoading).then(response => {
         this.data = response.data.listObject
         this.paginationConfig.total = response.data.itemCount
       })
@@ -159,6 +185,9 @@ export default {
     showErrorMassage(massage) {
       this.show_error_massage = true
       this.error_massage = massage
+    },
+    jumpTask(item){
+      this.$emit('jumpTask', item)
     }
   }
 }

frontend/src/views/system/task/dataset.vue

@@ -2,12 +2,12 @@
   <layout-content v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
 
     <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
-      <el-tabs v-model="tabActive">
+      <el-tabs v-model="tabActive" @tab-click="changeTab">
-        <el-tab-pane :label="$t('dataset.task.list')" name="DatasetTaskList">
+        <el-tab-pane :label="$t('dataset.task.list')" name="DatasetTaskList" >
-          <dataset-task-list />
+          <dataset-task-list :param="task" @jumpTaskRecord="jumpTaskRecord" v-if="tabActive=='DatasetTaskList'" />
         </el-tab-pane>
         <el-tab-pane  :label="$t('dataset.task.record')" name="TaskRecord">
-          <task-record ref="task_record" />
+          <task-record :param="task"  @jumpTask="jumpTask" v-if="tabActive=='TaskRecord'" />
         </el-tab-pane>
       </el-tabs>
     </el-row>
@@ -30,6 +30,7 @@ export default {
   components: { DatasetTableData, LayoutContent, ComplexTable, UnionView, UpdateInfo, TabDataPreview, DatasetTaskList, TaskRecord },
   data() {
     return {
+      task: null,
       tabActive: 'DatasetTaskList'
     }
   },
@@ -51,7 +52,18 @@ export default {
     })
   },
   methods: {
-
+    changeTab(){
+      this.task = null
+      console.log(this.tabActive)
+    },
+    jumpTaskRecord(task){
+      this.task = task
+      this.tabActive = 'TaskRecord'
+    },
+    jumpTask(task) {
+      this.task = task
+      this.tabActive = 'DatasetTaskList'
+    },
     toMsgShare(routerParam) {
       if (routerParam !== null && routerParam.msgNotification) {
         const panelShareTypeIds = [4, 5, 6]