diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableTask.java b/backend/src/main/java/io/dataease/base/domain/DatasetTableTask.java index c6171d0de6..46da2b5eeb 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableTask.java +++ b/backend/src/main/java/io/dataease/base/domain/DatasetTableTask.java @@ -25,5 +25,11 @@ public class DatasetTableTask implements Serializable { private Long createTime; + private Long lastExecTime; + + private String status; + + private String lastExecStatus; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskExample.java b/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskExample.java index 531cdce844..801373393a 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskExample.java +++ b/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskExample.java @@ -773,6 +773,206 @@ public class DatasetTableTaskExample { addCriterion("create_time not between", value1, value2, "createTime"); return (Criteria) this; } + + public Criteria andLastExecTimeIsNull() { + addCriterion("last_exec_time is null"); + return (Criteria) this; + } + + public Criteria andLastExecTimeIsNotNull() { + addCriterion("last_exec_time is not null"); + return (Criteria) this; + } + + public Criteria andLastExecTimeEqualTo(Long value) { + addCriterion("last_exec_time =", value, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andLastExecTimeNotEqualTo(Long value) { + addCriterion("last_exec_time <>", value, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andLastExecTimeGreaterThan(Long value) { + addCriterion("last_exec_time >", value, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andLastExecTimeGreaterThanOrEqualTo(Long value) { + addCriterion("last_exec_time >=", value, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andLastExecTimeLessThan(Long value) { + addCriterion("last_exec_time <", value, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andLastExecTimeLessThanOrEqualTo(Long value) { + addCriterion("last_exec_time <=", value, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andLastExecTimeIn(List values) { + addCriterion("last_exec_time in", values, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andLastExecTimeNotIn(List values) { + addCriterion("last_exec_time not in", values, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andLastExecTimeBetween(Long value1, Long value2) { + addCriterion("last_exec_time between", value1, value2, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andLastExecTimeNotBetween(Long value1, Long value2) { + addCriterion("last_exec_time not between", value1, value2, "lastExecTime"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(String value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(String value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(String value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(String value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(String value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(String value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLike(String value) { + addCriterion("`status` like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotLike(String value) { + addCriterion("`status` not like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(String value1, String value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(String value1, String value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andLastExecStatusIsNull() { + addCriterion("last_exec_status is null"); + return (Criteria) this; + } + + public Criteria andLastExecStatusIsNotNull() { + addCriterion("last_exec_status is not null"); + return (Criteria) this; + } + + public Criteria andLastExecStatusEqualTo(String value) { + addCriterion("last_exec_status =", value, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusNotEqualTo(String value) { + addCriterion("last_exec_status <>", value, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusGreaterThan(String value) { + addCriterion("last_exec_status >", value, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusGreaterThanOrEqualTo(String value) { + addCriterion("last_exec_status >=", value, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusLessThan(String value) { + addCriterion("last_exec_status <", value, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusLessThanOrEqualTo(String value) { + addCriterion("last_exec_status <=", value, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusLike(String value) { + addCriterion("last_exec_status like", value, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusNotLike(String value) { + addCriterion("last_exec_status not like", value, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusIn(List values) { + addCriterion("last_exec_status in", values, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusNotIn(List values) { + addCriterion("last_exec_status not in", values, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusBetween(String value1, String value2) { + addCriterion("last_exec_status between", value1, value2, "lastExecStatus"); + return (Criteria) this; + } + + public Criteria andLastExecStatusNotBetween(String value1, String value2) { + addCriterion("last_exec_status not between", value1, value2, "lastExecStatus"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLog.java b/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLog.java index 3419163d1b..3c5040feac 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLog.java +++ b/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLog.java @@ -19,6 +19,8 @@ public class DatasetTableTaskLog implements Serializable { private Long createTime; + private String triggerType; + private String info; private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLogExample.java b/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLogExample.java index ed3337762d..82ca70c6ab 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLogExample.java +++ b/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLogExample.java @@ -563,6 +563,76 @@ public class DatasetTableTaskLogExample { addCriterion("create_time not between", value1, value2, "createTime"); return (Criteria) this; } + + public Criteria andTriggerTypeIsNull() { + addCriterion("trigger_type is null"); + return (Criteria) this; + } + + public Criteria andTriggerTypeIsNotNull() { + addCriterion("trigger_type is not null"); + return (Criteria) this; + } + + public Criteria andTriggerTypeEqualTo(String value) { + addCriterion("trigger_type =", value, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeNotEqualTo(String value) { + addCriterion("trigger_type <>", value, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeGreaterThan(String value) { + addCriterion("trigger_type >", value, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeGreaterThanOrEqualTo(String value) { + addCriterion("trigger_type >=", value, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeLessThan(String value) { + addCriterion("trigger_type <", value, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeLessThanOrEqualTo(String value) { + addCriterion("trigger_type <=", value, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeLike(String value) { + addCriterion("trigger_type like", value, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeNotLike(String value) { + addCriterion("trigger_type not like", value, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeIn(List values) { + addCriterion("trigger_type in", values, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeNotIn(List values) { + addCriterion("trigger_type not in", values, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeBetween(String value1, String value2) { + addCriterion("trigger_type between", value1, value2, "triggerType"); + return (Criteria) this; + } + + public Criteria andTriggerTypeNotBetween(String value1, String value2) { + addCriterion("trigger_type not between", value1, value2, "triggerType"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.xml b/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.xml index d1bf30905e..3903dd301a 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.xml @@ -9,6 +9,7 @@ + @@ -72,7 +73,7 @@ - id, table_id, task_id, start_time, end_time, `status`, create_time + id, table_id, task_id, start_time, end_time, `status`, create_time, trigger_type info @@ -128,10 +129,12 @@ insert into dataset_table_task_log (id, table_id, task_id, start_time, end_time, `status`, - create_time, info) + create_time, trigger_type, info + ) values (#{id,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}, #{info,jdbcType=LONGVARCHAR}) + #{createTime,jdbcType=BIGINT}, #{triggerType,jdbcType=VARCHAR}, #{info,jdbcType=LONGVARCHAR} + ) insert into dataset_table_task_log @@ -157,6 +160,9 @@ create_time, + + trigger_type, + info, @@ -183,6 +189,9 @@ #{createTime,jdbcType=BIGINT}, + + #{triggerType,jdbcType=VARCHAR}, + #{info,jdbcType=LONGVARCHAR}, @@ -218,6 +227,9 @@ create_time = #{record.createTime,jdbcType=BIGINT}, + + trigger_type = #{record.triggerType,jdbcType=VARCHAR}, + info = #{record.info,jdbcType=LONGVARCHAR}, @@ -235,6 +247,7 @@ end_time = #{record.endTime,jdbcType=BIGINT}, `status` = #{record.status,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, + trigger_type = #{record.triggerType,jdbcType=VARCHAR}, info = #{record.info,jdbcType=LONGVARCHAR} @@ -248,7 +261,8 @@ start_time = #{record.startTime,jdbcType=BIGINT}, end_time = #{record.endTime,jdbcType=BIGINT}, `status` = #{record.status,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT} + create_time = #{record.createTime,jdbcType=BIGINT}, + trigger_type = #{record.triggerType,jdbcType=VARCHAR} @@ -274,6 +288,9 @@ create_time = #{createTime,jdbcType=BIGINT}, + + trigger_type = #{triggerType,jdbcType=VARCHAR}, + info = #{info,jdbcType=LONGVARCHAR}, @@ -288,6 +305,7 @@ end_time = #{endTime,jdbcType=BIGINT}, `status` = #{status,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, + trigger_type = #{triggerType,jdbcType=VARCHAR}, info = #{info,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} @@ -298,7 +316,8 @@ start_time = #{startTime,jdbcType=BIGINT}, end_time = #{endTime,jdbcType=BIGINT}, `status` = #{status,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT} + create_time = #{createTime,jdbcType=BIGINT}, + trigger_type = #{triggerType,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.xml b/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.xml index 5a6c1055e6..3ebbb5442c 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.xml @@ -12,6 +12,9 @@ + + + @@ -72,7 +75,8 @@ - id, table_id, `name`, `type`, start_time, rate, cron, `end`, end_time, create_time + id, table_id, `name`, `type`, start_time, rate, cron, `end`, end_time, create_time, + last_exec_time, `status`, last_exec_status @@ -220,6 +244,15 @@ create_time = #{record.createTime,jdbcType=BIGINT}, + + last_exec_time = #{record.lastExecTime,jdbcType=BIGINT}, + + + `status` = #{record.status,jdbcType=VARCHAR}, + + + last_exec_status = #{record.lastExecStatus,jdbcType=VARCHAR}, + @@ -236,7 +269,10 @@ cron = #{record.cron,jdbcType=VARCHAR}, `end` = #{record.end,jdbcType=VARCHAR}, end_time = #{record.endTime,jdbcType=BIGINT}, - create_time = #{record.createTime,jdbcType=BIGINT} + create_time = #{record.createTime,jdbcType=BIGINT}, + last_exec_time = #{record.lastExecTime,jdbcType=BIGINT}, + `status` = #{record.status,jdbcType=VARCHAR}, + last_exec_status = #{record.lastExecStatus,jdbcType=VARCHAR} @@ -271,6 +307,15 @@ create_time = #{createTime,jdbcType=BIGINT}, + + last_exec_time = #{lastExecTime,jdbcType=BIGINT}, + + + `status` = #{status,jdbcType=VARCHAR}, + + + last_exec_status = #{lastExecStatus,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -284,7 +329,10 @@ cron = #{cron,jdbcType=VARCHAR}, `end` = #{end,jdbcType=VARCHAR}, end_time = #{endTime,jdbcType=BIGINT}, - create_time = #{createTime,jdbcType=BIGINT} + create_time = #{createTime,jdbcType=BIGINT}, + last_exec_time = #{lastExecTime,jdbcType=BIGINT}, + `status` = #{status,jdbcType=VARCHAR}, + last_exec_status = #{lastExecStatus,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml index 1f1d6ad214..b0fdba70dc 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml @@ -21,6 +21,9 @@ and mode = #{mode,jdbcType=INTEGER} + + and type = #{type,jdbcType=VARCHAR} + and type in diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java index 16356e5c1c..423b23201d 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java @@ -1,6 +1,8 @@ package io.dataease.base.mapper.ext; import io.dataease.base.domain.DatasetTableTaskLog; +import io.dataease.base.mapper.ext.query.GridExample; +import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.dto.dataset.DataSetTaskLogDTO; import org.apache.ibatis.annotations.Mapper; @@ -12,5 +14,7 @@ import java.util.List; */ @Mapper public interface ExtDataSetTaskMapper { - List list(DatasetTableTaskLog request); + List list(GridExample example); + + List taskList(GridExample example); } diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml index 6262852381..16ce894c3e 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml @@ -7,13 +7,42 @@ + + + + + + + + + diff --git a/backend/src/main/java/io/dataease/commons/constants/ScheduleType.java b/backend/src/main/java/io/dataease/commons/constants/ScheduleType.java index 18aeb65588..98b4fde4dd 100644 --- a/backend/src/main/java/io/dataease/commons/constants/ScheduleType.java +++ b/backend/src/main/java/io/dataease/commons/constants/ScheduleType.java @@ -1,5 +1,5 @@ package io.dataease.commons.constants; public enum ScheduleType { - CRON, SIMPLE, SIMPLE_COMPLETE + CRON, SIMPLE } diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java index 7edb03030e..391dc78a2e 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java @@ -1,8 +1,17 @@ package io.dataease.controller.dataset; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import io.dataease.base.domain.DatasetTableTask; +import io.dataease.commons.utils.PageUtils; +import io.dataease.commons.utils.Pager; import io.dataease.controller.request.dataset.DataSetTaskRequest; +import io.dataease.controller.sys.base.BaseGridRequest; +import io.dataease.controller.sys.response.SysUserGridResponse; +import io.dataease.dto.dataset.DataSetTaskDTO; +import io.dataease.service.dataset.DataSetTableTaskLogService; import io.dataease.service.dataset.DataSetTableTaskService; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -17,6 +26,8 @@ import java.util.List; public class DataSetTableTaskController { @Resource private DataSetTableTaskService dataSetTableTaskService; + @Resource + private DataSetTableTaskLogService dataSetTableTaskLogService; @PostMapping("save") public DatasetTableTask save(@RequestBody DataSetTaskRequest dataSetTaskRequest) throws Exception { @@ -32,4 +43,28 @@ public class DataSetTableTaskController { public List list(@RequestBody DatasetTableTask datasetTableTask) { return dataSetTableTaskService.list(datasetTableTask); } + + @ApiOperation("查看数据集任务") + @PostMapping("/pageList/{goPage}/{pageSize}") + public Pager> taskList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) { + Page page = PageHelper.startPage(goPage, pageSize, true); + + return PageUtils.setPageInfo(page, dataSetTableTaskService.taskList(request)); + } + + @PostMapping("/lastExecStatus") + public DataSetTaskDTO lastExecStatus(@RequestBody DataSetTaskDTO datasetTableTask) { + return dataSetTableTaskLogService.lastExecStatus(datasetTableTask); + } + + @PostMapping("/updateStatus") + public void updateStatus(@RequestBody DatasetTableTask datasetTableTask) { + dataSetTableTaskService.updateDatasetTableTaskStatus(datasetTableTask); + } + + @PostMapping("/execTask") + public void execTask(@RequestBody DatasetTableTask datasetTableTask) throws Exception{ + dataSetTableTaskService.execTask(datasetTableTask); + } + } diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java index 3269b3eb8b..4b0123fe3c 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import io.dataease.base.domain.DatasetTableTaskLog; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; +import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.dataset.DataSetTaskLogDTO; import io.dataease.service.dataset.DataSetTableTaskLogService; import org.springframework.web.bind.annotation.*; @@ -33,7 +34,7 @@ public class DataSetTableTaskLogController { } @PostMapping("list/{goPage}/{pageSize}") - public Pager> list(@RequestBody DatasetTableTaskLog request, @PathVariable int goPage, @PathVariable int pageSize) { + public Pager> list(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, dataSetTableTaskLogService.list(request)); } diff --git a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java index 14c8b9600b..c8597498a5 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java +++ b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java @@ -430,4 +430,10 @@ public class ScheduleManager { } return trigger.getFireTimeAfter(start); } + + public void fireNow(String jobName, String jobGroup) throws SchedulerException { + JobKey jobKey = new JobKey(jobName, jobGroup); + scheduler.triggerJob(jobKey); + } + } diff --git a/backend/src/main/java/io/dataease/listener/AppStartListener.java b/backend/src/main/java/io/dataease/listener/AppStartListener.java index 7acbdb007d..5d5aa70e6b 100644 --- a/backend/src/main/java/io/dataease/listener/AppStartListener.java +++ b/backend/src/main/java/io/dataease/listener/AppStartListener.java @@ -1,7 +1,9 @@ package io.dataease.listener; import io.dataease.base.domain.DatasetTableTask; +import io.dataease.commons.constants.NoticeConstants; import io.dataease.commons.constants.ScheduleType; +import io.dataease.commons.constants.TaskStatus; import io.dataease.service.ScheduleService; import io.dataease.service.dataset.DataSetTableTaskService; import org.apache.commons.lang3.StringUtils; @@ -41,7 +43,9 @@ public class AppStartListener implements ApplicationListener taskIds = datasetTableTaskLogMapper.selectByExample(datasetTableTaskLogExample).stream().map(DatasetTableTaskLog::getTaskId).collect(Collectors.toList()); datasetTableTaskLogMapper.updateByExampleSelective(datasetTableTaskLog, datasetTableTaskLogExample); + + DatasetTableTask datasetTableTask = new DatasetTableTask(); + datasetTableTask.setLastExecStatus(JobStatus.Error.name()); + dataSetTableTaskService.update(taskIds, datasetTableTask); + for (DatasetTable jobStoppeddDatasetTable : jobStoppeddDatasetTables) { extractDataService.deleteFile("all_scope", jobStoppeddDatasetTable.getId()); extractDataService.deleteFile("incremental_add", jobStoppeddDatasetTable.getId()); extractDataService.deleteFile("incremental_delete", jobStoppeddDatasetTable.getId()); - } } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java index 286cae3cc5..c785cc3828 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java @@ -1,10 +1,16 @@ package io.dataease.service.dataset; +import io.dataease.base.domain.DatasetTableTask; import io.dataease.base.domain.DatasetTableTaskLog; import io.dataease.base.domain.DatasetTableTaskLogExample; import io.dataease.base.mapper.DatasetTableTaskLogMapper; +import io.dataease.base.mapper.DatasetTableTaskMapper; import io.dataease.base.mapper.ext.ExtDataSetTaskMapper; +import io.dataease.base.mapper.ext.query.GridExample; +import io.dataease.controller.sys.base.BaseGridRequest; +import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.dto.dataset.DataSetTaskLogDTO; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -38,8 +44,9 @@ public class DataSetTableTaskLogService { datasetTableTaskLogMapper.deleteByPrimaryKey(id); } - public List list(DatasetTableTaskLog request) { - return extDataSetTaskMapper.list(request); + public List list(BaseGridRequest request) { + GridExample gridExample = request.convertExample(); + return extDataSetTaskMapper.list(gridExample); } public void deleteByTaskId(String taskId){ @@ -57,6 +64,30 @@ public class DataSetTableTaskLogService { } public List select(DatasetTableTaskLog datasetTableTaskLog){ + DatasetTableTaskLogExample example = getDatasetTableTaskLogExample(datasetTableTaskLog); + example.setOrderByClause("create_time desc"); + return datasetTableTaskLogMapper.selectByExampleWithBLOBs(example); + } + + public DataSetTaskDTO lastExecStatus(DataSetTaskDTO dataSetTaskDTO){ + DatasetTableTaskLogExample example = new DatasetTableTaskLogExample(); + DatasetTableTaskLogExample.Criteria criteria = example.createCriteria(); + if(StringUtils.isNotEmpty(dataSetTaskDTO.getTableId())){ + criteria.andTableIdEqualTo(dataSetTaskDTO.getTableId()); + } + if(StringUtils.isNotEmpty(dataSetTaskDTO.getId())){ + criteria.andTaskIdEqualTo(dataSetTaskDTO.getId()); + } + example.setOrderByClause("create_time desc limit 1"); + List datasetTableTaskLogs = datasetTableTaskLogMapper.selectByExampleWithBLOBs(example); + if(CollectionUtils.isNotEmpty(datasetTableTaskLogs)){ + dataSetTaskDTO.setLastExecStatus(datasetTableTaskLogs.get(0).getStatus()); + dataSetTaskDTO.setLastExecTime(datasetTableTaskLogs.get(0).getCreateTime()); + } + return dataSetTaskDTO; + } + + private DatasetTableTaskLogExample getDatasetTableTaskLogExample(DatasetTableTaskLog datasetTableTaskLog) { DatasetTableTaskLogExample example = new DatasetTableTaskLogExample(); DatasetTableTaskLogExample.Criteria criteria = example.createCriteria(); if(StringUtils.isNotEmpty(datasetTableTaskLog.getStatus())){ @@ -68,7 +99,8 @@ public class DataSetTableTaskLogService { if(StringUtils.isNotEmpty(datasetTableTaskLog.getTaskId())){ criteria.andTaskIdEqualTo(datasetTableTaskLog.getTaskId()); } - example.setOrderByClause("create_time desc"); - return datasetTableTaskLogMapper.selectByExampleWithBLOBs(example); + return example; } + + } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java index 55097ece70..0f3e5e5839 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java @@ -1,16 +1,26 @@ package io.dataease.service.dataset; +import com.google.gson.Gson; import io.dataease.base.domain.DatasetTable; import io.dataease.base.domain.DatasetTableTask; import io.dataease.base.domain.DatasetTableTaskExample; import io.dataease.base.domain.DatasetTableTaskLog; import io.dataease.base.mapper.DatasetTableTaskMapper; +import io.dataease.base.mapper.ext.ExtDataSetTaskMapper; +import io.dataease.base.mapper.ext.query.GridExample; import io.dataease.commons.constants.JobStatus; import io.dataease.commons.constants.ScheduleType; +import io.dataease.commons.constants.TaskStatus; +import io.dataease.commons.constants.TriggerType; import io.dataease.controller.request.dataset.DataSetTaskRequest; +import io.dataease.controller.sys.base.BaseGridRequest; +import io.dataease.controller.sys.response.SysUserGridResponse; +import io.dataease.controller.sys.response.SysUserRole; +import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; import io.dataease.service.ScheduleService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.quartz.CronExpression; @@ -21,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; /** * @Author gin @@ -40,12 +51,15 @@ public class DataSetTableTaskService { private DataSetTableService dataSetTableService; @Resource private ExtractDataService extractDataService; + @Resource + private ExtDataSetTaskMapper extDataSetTaskMapper; public DatasetTableTask save(DataSetTaskRequest dataSetTaskRequest) throws Exception { checkName(dataSetTaskRequest); DatasetTableTask datasetTableTask = dataSetTaskRequest.getDatasetTableTask(); - dataSetTableService.saveIncrementalConfig(dataSetTaskRequest.getDatasetTableIncrementalConfig()); - + if(!datasetTableTask.getType().equalsIgnoreCase("all_scope")){ + dataSetTableService.saveIncrementalConfig(dataSetTaskRequest.getDatasetTableIncrementalConfig()); + } // check if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(),"CRON")){ if (StringUtils.isNotEmpty(datasetTableTask.getCron())) { @@ -67,25 +81,9 @@ public class DataSetTableTaskService { if (StringUtils.isEmpty(datasetTableTask.getId())) { datasetTableTask.setId(UUID.randomUUID().toString()); datasetTableTask.setCreateTime(System.currentTimeMillis()); - // SIMPLE 类型，提前占位 - if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { - if (datasetTableTask.getType().equalsIgnoreCase("add_scope")) { - DatasetTable datasetTable = dataSetTableService.get(datasetTableTask.getTableId()); - if (datasetTable.getLastUpdateTime() == 0 || datasetTable.getLastUpdateTime() == null) { - DataEaseException.throwException(Translator.get("i18n_not_exec_add_sync")); - } - } - if (extractDataService.updateSyncStatusIsNone(dataSetTableService.get(datasetTableTask.getTableId()))) { - DataEaseException.throwException(Translator.get("i18n_sync_job_exists")); - } else { - //write log - DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog(); - datasetTableTaskLog.setTableId(datasetTableTask.getTableId()); - datasetTableTaskLog.setTaskId(datasetTableTask.getId()); - datasetTableTaskLog.setStatus(JobStatus.Underway.name()); - datasetTableTaskLog.setStartTime(System.currentTimeMillis()); - dataSetTableTaskLogService.save(datasetTableTaskLog); - } + datasetTableTask.setStatus(TaskStatus.Underway.name()); + if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { // SIMPLE 类型，提前占位 + execNow(datasetTableTask); } datasetTableTaskMapper.insert(datasetTableTask); } else { @@ -95,6 +93,26 @@ public class DataSetTableTaskService { return datasetTableTask; } + private void execNow(DatasetTableTask datasetTableTask) { + if (datasetTableTask.getType().equalsIgnoreCase("add_scope")) { + DatasetTable datasetTable = dataSetTableService.get(datasetTableTask.getTableId()); + if (datasetTable.getLastUpdateTime() == null || datasetTable.getLastUpdateTime() == 0) { + DataEaseException.throwException(Translator.get("i18n_not_exec_add_sync")); + } + } + if (extractDataService.updateSyncStatusIsNone(dataSetTableService.get(datasetTableTask.getTableId()))) { + DataEaseException.throwException(Translator.get("i18n_sync_job_exists")); + } else { //write log + DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog(); + datasetTableTaskLog.setTableId(datasetTableTask.getTableId()); + datasetTableTaskLog.setTaskId(datasetTableTask.getId()); + datasetTableTaskLog.setStatus(JobStatus.Underway.name()); + datasetTableTaskLog.setStartTime(System.currentTimeMillis()); + datasetTableTaskLog.setTriggerType(TriggerType.Custom.name()); + dataSetTableTaskLogService.save(datasetTableTaskLog); + } + } + public void delete(String id) { DatasetTableTask datasetTableTask = datasetTableTaskMapper.selectByPrimaryKey(id); datasetTableTaskMapper.deleteByPrimaryKey(id); @@ -121,19 +139,34 @@ public class DataSetTableTaskService { } public void update(DatasetTableTask datasetTableTask) { - datasetTableTaskMapper.updateByPrimaryKey(datasetTableTask); + datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask); + } + + public void update(List taskIds, DatasetTableTask datasetTableTask) { + if (CollectionUtils.isEmpty(taskIds)){ + return; + } + DatasetTableTaskExample example = new DatasetTableTaskExample(); + example.createCriteria().andIdIn(taskIds); + datasetTableTaskMapper.updateByExampleSelective(datasetTableTask, example); } public List list(DatasetTableTask datasetTableTask) { DatasetTableTaskExample datasetTableTaskExample = new DatasetTableTaskExample(); DatasetTableTaskExample.Criteria criteria = datasetTableTaskExample.createCriteria(); - if (StringUtils.isNotEmpty(datasetTableTask.getTableId())) { + if (datasetTableTask != null && StringUtils.isNotEmpty(datasetTableTask.getTableId())) { criteria.andTableIdEqualTo(datasetTableTask.getTableId()); } datasetTableTaskExample.setOrderByClause("create_time desc,name asc"); return datasetTableTaskMapper.selectByExample(datasetTableTaskExample); } + public List taskList(BaseGridRequest request) { + GridExample gridExample = request.convertExample(); + List dataSetTaskDTOS = extDataSetTaskMapper.taskList(gridExample); + return dataSetTaskDTOS; + } + private void checkName(DataSetTaskRequest dataSetTaskRequest) { DatasetTableTaskExample datasetTableTaskExample = new DatasetTableTaskExample(); DatasetTableTaskExample.Criteria criteria = datasetTableTaskExample.createCriteria(); @@ -151,4 +184,27 @@ public class DataSetTableTaskService { throw new RuntimeException(Translator.get("i18n_task_name_repeat")); } } + + public void updateDatasetTableTaskStatus(DatasetTableTask datasetTableTask){ + DatasetTableTaskExample datasetTableTaskExample = new DatasetTableTaskExample(); + DatasetTableTaskExample.Criteria criteria = datasetTableTaskExample.createCriteria(); + criteria.andIdEqualTo(datasetTableTask.getId()); + DatasetTableTask record = new DatasetTableTask(); + record.setStatus(datasetTableTask.getStatus()); + datasetTableTaskMapper.updateByExampleSelective(record, datasetTableTaskExample); + } + + public void execTask(DatasetTableTask datasetTableTask) throws Exception{ + if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.CRON.toString())){ + scheduleService.fireNow(datasetTableTask); + } + if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){ + execNow(datasetTableTask); + datasetTableTask.setStatus(TaskStatus.Underway.name()); + datasetTableTask.setLastExecStatus(JobStatus.Underway.name()); + update(datasetTableTask); + scheduleService.addSchedule(datasetTableTask); + } + + } } diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 9e262a7022..bbd3771d5c 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -6,10 +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.commons.constants.JdbcConstants; -import io.dataease.commons.constants.JobStatus; -import io.dataease.commons.constants.ScheduleType; -import io.dataease.commons.constants.UpdateType; +import io.dataease.commons.constants.*; import io.dataease.commons.model.AuthURD; import io.dataease.commons.utils.*; import io.dataease.datasource.constants.DatasourceTypes; @@ -136,10 +133,8 @@ public class ExtractDataService { public synchronized boolean updateSyncStatusIsNone(DatasetTable datasetTable ){ datasetTable.setSyncStatus(JobStatus.Underway.name()); + DatasetTableExample example = new DatasetTableExample(); - example.createCriteria().andIdEqualTo(datasetTable.getId()); - datasetTableMapper.selectByExample(example); - example.clear(); example.createCriteria().andIdEqualTo(datasetTable.getId()).andSyncStatusNotEqualTo(JobStatus.Underway.name()); example.or(example.createCriteria().andIdEqualTo(datasetTable.getId()).andSyncStatusIsNull()); return datasetTableMapper.updateByExampleSelective(datasetTable, example) == 0; @@ -156,6 +151,10 @@ public class ExtractDataService { LogUtil.info("Skip synchronization task for table : " + datasetTableId); return; } + datasetTableTask.setLastExecTime(System.currentTimeMillis()); + datasetTableTask.setLastExecStatus(JobStatus.Underway.name()); + dataSetTableTaskService.update(datasetTableTask); + DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog(); UpdateType updateType = UpdateType.valueOf(type); if(context != null){ @@ -207,18 +206,23 @@ public class ExtractDataService { sendWebMsg(datasetTable, taskId,true); -// deleteFile("all_scope", datasetTableId); + deleteFile("all_scope", datasetTableId); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime); + + datasetTableTask.setLastExecStatus(JobStatus.Completed.name()); + dataSetTableTaskService.update(datasetTableTask); }catch (Exception e){ saveErrorLog(datasetTableId, taskId, e); + datasetTableTask.setLastExecStatus(JobStatus.Error.name()); + dataSetTableTaskService.update(datasetTableTask); sendWebMsg(datasetTable, taskId,false); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); -// deleteFile("all_scope", datasetTableId); + deleteFile("all_scope", datasetTableId); }finally { if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { - datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString()); + datasetTableTask.setStatus(TaskStatus.Stopped.name()); dataSetTableTaskService.update(datasetTableTask); } } @@ -274,20 +278,24 @@ public class ExtractDataService { sendWebMsg(datasetTable, taskId,true); -// deleteFile("incremental_add", datasetTableId); -// deleteFile("incremental_delete", datasetTableId); + deleteFile("incremental_add", datasetTableId); + deleteFile("incremental_delete", datasetTableId); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime); + datasetTableTask.setLastExecStatus(JobStatus.Completed.name()); + dataSetTableTaskService.update(datasetTableTask); } }catch (Exception e){ saveErrorLog(datasetTableId, taskId, e); sendWebMsg(datasetTable, taskId,false); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); -// deleteFile("incremental_add", datasetTableId); -// deleteFile("incremental_delete", datasetTableId); + datasetTableTask.setLastExecStatus(JobStatus.Error.name()); + dataSetTableTaskService.update(datasetTableTask); + deleteFile("incremental_add", datasetTableId); + deleteFile("incremental_delete", datasetTableId); }finally { if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { - datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString()); + datasetTableTask.setStatus(TaskStatus.Stopped.name()); dataSetTableTaskService.update(datasetTableTask); } } @@ -435,6 +443,7 @@ public class ExtractDataService { datasetTableTaskLog.setTableId(datasetTableId); datasetTableTaskLog.setTaskId(taskId); datasetTableTaskLog.setStatus(JobStatus.Underway.name()); + datasetTableTaskLog.setTriggerType(TriggerType.Cron.name()); List datasetTableTaskLogs = dataSetTableTaskLogService.select(datasetTableTaskLog); if(CollectionUtils.isEmpty(datasetTableTaskLogs)){ datasetTableTaskLog.setStartTime(System.currentTimeMillis()); diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml index 6175f7e18b..6b2c37cdd2 100644 --- a/backend/src/main/resources/generatorConfig.xml +++ b/backend/src/main/resources/generatorConfig.xml @@ -74,7 +74,7 @@ - +
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index 7045b0b9da..f5100ed445 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -128,4 +128,21 @@ export function isKettleRunning(showLoading = true) { }) } +export function taskList(spage, size, data) { + return request({ + url: '/dataset/group/isKettleRunning', + method: 'post', + loading: showLoading + }) +} + +export function datasetTaskList(page, size, data) { + return request({ + url: '/dataset/task/pageList/' + page + '/' + size, + method: 'post', + data, + loading: true + }) +} + export default { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree } diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 8ac6f042ea..8109f5cbea 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -913,7 +913,23 @@ export default { m2: ' 移动到', char_can_not_more_50: '数据集名称不能超过50个字符', task_add_title: '添加任务', - task_edit_title: '编辑任务' + task_edit_title: '编辑任务', + task: { + list: '任务列表', + record: '执行记录', + create: '新建任务', + name: '任务名称', + last_exec_time: '上次执行时间', + next_exec_time: '下次执行时间', + last_exec_status: '上次执行结果', + task_status: '任务状态', + dataset: '数据集', + search_by_name: '根据名称搜索', + underway: '运行中', + stopped: '停止', + exec: '执行', + confirm_exec: '手动触发执行？' + } }, datasource: { datasource: '数据源', diff --git a/frontend/src/utils/webMsg.js b/frontend/src/utils/webMsg.js index 0f57d12276..b251540641 100644 --- a/frontend/src/utils/webMsg.js +++ b/frontend/src/utils/webMsg.js @@ -1,7 +1,4 @@ export const msgTypes = [ - // { value: -1, label: '全部类型' }, - // { value: 0, label: '仪表板分享' }, - // { value: 1, label: '数据集同步' } { value: -1, label: 'webmsg.all_type' }, { value: 0, label: 'webmsg.panel_type' }, { value: 1, label: 'webmsg.dataset_type' } diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index d87212a8c7..770a1d0e77 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -7,20 +7,9 @@ {{ $t('chart.datalist') }} - - - - - - - - - - - @@ -53,14 +42,6 @@ > - - - - - - - - @@ -80,9 +61,6 @@ {{ $t('chart.group') }} - - - {{ $t('chart.add_chart') }} @@ -660,25 +638,10 @@ export default { if (data.type !== 'group') { this.$emit('switchComponent', { name: 'ChartEdit', param: { 'id': data.id }}) } - // if (data.type === 'scene') { - // this.sceneMode = true - // this.currGroup = data - // this.$store.dispatch('chart/setSceneId', this.currGroup.id) - // this.chartTree() - // } - // if (node.expanded) { - // this.expandedArray.push(data.id) - // } else { - // const index = this.expandedArray.indexOf(data.id) - // if (index > -1) { - // this.expandedArray.splice(index, 1) - // } - // } }, back() { this.sceneMode = false - // this.$router.push('/chart/home') this.$emit('switchComponent', { name: '' }) }, @@ -687,13 +650,9 @@ export default { 'type': type } }, - sceneClick(data, node) { - // this.$store.dispatch('chart/setViewId', null) - // this.$store.dispatch('chart/setViewId', data.id) this.$emit('switchComponent', { name: 'ChartEdit', param: { 'id': data.id }}) }, - reviewChartList() { if (this.$store.state.chart.chartSceneData) { const that = this @@ -759,10 +718,7 @@ export default { this.closeCreateChart() this.$store.dispatch('chart/setTableId', null) this.$store.dispatch('chart/setTableId', this.table.id) - // this.$router.push('/chart/chart-edit') this.$emit('switchComponent', { name: 'ChartEdit', param: { 'id': response.data.id }}) - // this.$store.dispatch('chart/setViewId', response.data.id) - // this.chartTree() this.refreshNodeBy(view.sceneId) }) }, diff --git a/frontend/src/views/chart/view/TableSelector.vue b/frontend/src/views/chart/view/TableSelector.vue index 23ea6955b2..7660de1a46 100644 --- a/frontend/src/views/chart/view/TableSelector.vue +++ b/frontend/src/views/chart/view/TableSelector.vue @@ -1,7 +1,7 @@