github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #183 from dataease/pr@dev@taskmgm

Browse Source 
feat: 任务管理
This commit is contained in:
taojinlong 2021-07-08 14:17:15 +08:00 committed by GitHub
commit 70c51f98c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 1604 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/base/domain/DatasetTableTask.java
View File

@ -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;
}

200
backend/src/main/java/io/dataease/base/domain/DatasetTableTaskExample.java
View File

@ -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<Long> values) {
addCriterion("last_exec_time in", values, "lastExecTime");
return (Criteria) this;
}
public Criteria andLastExecTimeNotIn(List<Long> 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<String> values) {
addCriterion("`status` in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<String> 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<String> values) {
addCriterion("last_exec_status in", values, "lastExecStatus");
return (Criteria) this;
}
public Criteria andLastExecStatusNotIn(List<String> 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 {

2
backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLog.java
View File

@ -19,6 +19,8 @@ public class DatasetTableTaskLog implements Serializable {
private Long createTime;
private String triggerType;
private String info;
private static final long serialVersionUID = 1L;

70
backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLogExample.java
View File

@ -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<String> values) {
addCriterion("trigger_type in", values, "triggerType");
return (Criteria) this;
}
public Criteria andTriggerTypeNotIn(List<String> 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 {

29
backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.xml
View File

@ -9,6 +9,7 @@
<result column="end_time" jdbcType="BIGINT" property="endTime" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="create_time" jdbcType="BIGINT" property="createTime" />
<result column="trigger_type" jdbcType="VARCHAR" property="triggerType" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.DatasetTableTaskLog">
<result column="info" jdbcType="LONGVARCHAR" property="info" />
@ -72,7 +73,7 @@
</where>
</sql>
<sql id="Base_Column_List">
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
</sql>
<sql id="Blob_Column_List">
info
@ -128,10 +129,12 @@
<insert id="insert" parameterType="io.dataease.base.domain.DatasetTableTaskLog">
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>
<insert id="insertSelective" parameterType="io.dataease.base.domain.DatasetTableTaskLog">
insert into dataset_table_task_log
@ -157,6 +160,9 @@
<if test="createTime != null">
create_time,
</if>
<if test="triggerType != null">
trigger_type,
</if>
<if test="info != null">
info,
</if>
@ -183,6 +189,9 @@
<if test="createTime != null">
#{createTime,jdbcType=BIGINT},
</if>
<if test="triggerType != null">
#{triggerType,jdbcType=VARCHAR},
</if>
<if test="info != null">
#{info,jdbcType=LONGVARCHAR},
</if>
@ -218,6 +227,9 @@
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=BIGINT},
</if>
<if test="record.triggerType != null">
trigger_type = #{record.triggerType,jdbcType=VARCHAR},
</if>
<if test="record.info != null">
info = #{record.info,jdbcType=LONGVARCHAR},
</if>
@ -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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -274,6 +288,9 @@
<if test="createTime != null">
create_time = #{createTime,jdbcType=BIGINT},
</if>
<if test="triggerType != null">
trigger_type = #{triggerType,jdbcType=VARCHAR},
</if>
<if test="info != null">
info = #{info,jdbcType=LONGVARCHAR},
</if>
@ -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}
</update>
@ -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}
</update>
</mapper>

58
backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.xml
View File

@ -12,6 +12,9 @@
<result column="end" jdbcType="VARCHAR" property="end" />
<result column="end_time" jdbcType="BIGINT" property="endTime" />
<result column="create_time" jdbcType="BIGINT" property="createTime" />
<result column="last_exec_time" jdbcType="BIGINT" property="lastExecTime" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="last_exec_status" jdbcType="VARCHAR" property="lastExecStatus" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -72,7 +75,8 @@
</where>
</sql>
<sql id="Base_Column_List">
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
</sql>
<select id="selectByExample" parameterType="io.dataease.base.domain.DatasetTableTaskExample" resultMap="BaseResultMap">
select
@ -108,11 +112,13 @@
insert into dataset_table_task (id, table_id, `name`,
`type`, start_time, rate,
cron, `end`, end_time,
create_time)
create_time, last_exec_time, `status`,
last_exec_status)
values (#{id,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR}, #{startTime,jdbcType=BIGINT}, #{rate,jdbcType=VARCHAR},
#{cron,jdbcType=VARCHAR}, #{end,jdbcType=VARCHAR}, #{endTime,jdbcType=BIGINT},
#{createTime,jdbcType=BIGINT})
#{createTime,jdbcType=BIGINT}, #{lastExecTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR},
#{lastExecStatus,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="io.dataease.base.domain.DatasetTableTask">
insert into dataset_table_task
@ -147,6 +153,15 @@
<if test="createTime != null">
create_time,
</if>
<if test="lastExecTime != null">
last_exec_time,
</if>
<if test="status != null">
`status`,
</if>
<if test="lastExecStatus != null">
last_exec_status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -179,6 +194,15 @@
<if test="createTime != null">
#{createTime,jdbcType=BIGINT},
</if>
<if test="lastExecTime != null">
#{lastExecTime,jdbcType=BIGINT},
</if>
<if test="status != null">
#{status,jdbcType=VARCHAR},
</if>
<if test="lastExecStatus != null">
#{lastExecStatus,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="io.dataease.base.domain.DatasetTableTaskExample" resultType="java.lang.Long">
@ -220,6 +244,15 @@
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=BIGINT},
</if>
<if test="record.lastExecTime != null">
last_exec_time = #{record.lastExecTime,jdbcType=BIGINT},
</if>
<if test="record.status != null">
`status` = #{record.status,jdbcType=VARCHAR},
</if>
<if test="record.lastExecStatus != null">
last_exec_status = #{record.lastExecStatus,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -271,6 +307,15 @@
<if test="createTime != null">
create_time = #{createTime,jdbcType=BIGINT},
</if>
<if test="lastExecTime != null">
last_exec_time = #{lastExecTime,jdbcType=BIGINT},
</if>
<if test="status != null">
`status` = #{status,jdbcType=VARCHAR},
</if>
<if test="lastExecStatus != null">
last_exec_status = #{lastExecStatus,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
@ -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}
</update>
</mapper>

3
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
View File

@ -48,6 +48,9 @@
<if test="mode != null">
and mode = #{mode,jdbcType=INTEGER}
</if>
<if test="type != null">
and type = #{type,jdbcType=VARCHAR}
</if>
<if test="typeFilter != null">
and type in
<foreach collection="typeFilter" item="item" open="(" separator="," close=")">

6
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java
View File

@ -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<DataSetTaskLogDTO> list(DatasetTableTaskLog request);
List<DataSetTaskLogDTO> list(GridExample example);
List<DataSetTaskDTO> taskList(GridExample example);
}

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

@ -7,13 +7,42 @@
<result column="name" jdbcType="VARCHAR" property="name"/>
</resultMap>
<resultMap id="TaskResult" type="io.dataease.dto.dataset.DataSetTaskDTO" extends="io.dataease.base.mapper.DatasetTableTaskMapper.BaseResultMap">
<result column="table_name" jdbcType="VARCHAR" property="datasetName"/>
<result column="NEXT_FIRE_TIME" jdbcType="BIGINT" property="nextExecTime"/>
</resultMap>
<select id="list" resultMap="BaseResult" parameterType="io.dataease.base.domain.DatasetTableTaskLog">
SELECT dataset_table_task_log.*,
dataset_table_task.name
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
WHERE dataset_table_task_log.table_id = #{tableId,jdbcType=VARCHAR}
ORDER BY dataset_table_task_log.create_time desc
<if test="_parameter != null">
<include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
<if test="orderByClause == null">
ORDER BY dataset_table_task_log.create_time desc
</if>
</select>
<select id="taskList" resultMap="TaskResult" parameterType="io.dataease.base.mapper.ext.query.GridExample">
SELECT dataset_table.name as table_name, dataset_table_task.* , qrtz_triggers.*
FROM dataset_table_task
left join dataset_table on dataset_table.id=dataset_table_task.table_id
left join qrtz_triggers on dataset_table_task.id=qrtz_triggers.TRIGGER_NAME
<if test="_parameter != null">
<include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
<if test="orderByClause == null">
order by dataset_table_task.create_time desc
</if>
</select>
</mapper>

2
backend/src/main/java/io/dataease/commons/constants/ScheduleType.java
View File

@ -1,5 +1,5 @@
package io.dataease.commons.constants;
public enum ScheduleType {
CRON, SIMPLE, SIMPLE_COMPLETE
CRON, SIMPLE
}

5
backend/src/main/java/io/dataease/commons/constants/TaskStatus.java Normal file
View File

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

5
backend/src/main/java/io/dataease/commons/constants/TriggerType.java Normal file
View File

@ -0,0 +1,5 @@
package io.dataease.commons.constants;
public enum TriggerType {
Cron, Custom
}

35
backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java
View File

@ -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<DatasetTableTask> list(@RequestBody DatasetTableTask datasetTableTask) {
return dataSetTableTaskService.list(datasetTableTask);
}
@ApiOperation("查看数据集任务")
@PostMapping("/pageList/{goPage}/{pageSize}")
public Pager<List<DataSetTaskDTO>> taskList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) {
Page<Object> 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);
}
}

3
backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java
View File

@ -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<DataSetTaskLogDTO>> list(@RequestBody DatasetTableTaskLog request, @PathVariable int goPage, @PathVariable int pageSize) {
public Pager<List<DataSetTaskLogDTO>> list(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
return PageUtils.setPageInfo(page, dataSetTableTaskLogService.list(request));
}

18
backend/src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java Normal file
View File

@ -0,0 +1,18 @@
package io.dataease.dto.dataset;
import io.dataease.base.domain.DatasetTableTask;
import io.dataease.base.domain.DatasetTableTaskLog;
import lombok.Getter;
import lombok.Setter;
/**
* @Author gin
* @Date 2021/3/9 3:19 下午
*/
@Getter
@Setter
public class DataSetTaskDTO extends DatasetTableTask {
private String datasetName;
private Long nextExecTime;
private String taskStatus;
}

6
backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java
View File

@ -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);
}
}

4
backend/src/main/java/io/dataease/listener/AppStartListener.java
View File

@ -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;
@ -40,8 +42,6 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
} else {
scheduleService.addSchedule(task);
}
} else {
scheduleService.addSchedule(task);
}
} catch (Exception e) {
e.printStackTrace();

7
backend/src/main/java/io/dataease/service/ScheduleService.java
View File

@ -35,9 +35,6 @@ public class ScheduleService {
endTime = null;
} else {
endTime = new Date(datasetTableTask.getEndTime());
// if (endTime.before(new Date())) {
// return;
// }
if (endTime.before(new Date())) {
deleteSchedule(datasetTableTask);
return;
@ -58,4 +55,8 @@ public class ScheduleService {
public void deleteSchedule(DatasetTableTask datasetTableTask) {
scheduleManager.removeJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()), new TriggerKey(datasetTableTask.getId(), datasetTableTask.getTableId()));
}
public void fireNow(DatasetTableTask datasetTableTask) throws Exception{
scheduleManager.fireNow(datasetTableTask.getId(), datasetTableTask.getTableId());
}
}

7
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -1178,12 +1178,17 @@ public class DataSetTableService {
DatasetTableTaskLogExample datasetTableTaskLogExample = new DatasetTableTaskLogExample();
datasetTableTaskLogExample.createCriteria().andStatusEqualTo(JobStatus.Underway.name()).andTableIdIn(jobStoppeddDatasetTables.stream().map(DatasetTable::getId).collect(Collectors.toList()));
List<String> 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());
}
}

40
backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
View File

@ -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<DataSetTaskLogDTO> list(DatasetTableTaskLog request) {
return extDataSetTaskMapper.list(request);
public List<DataSetTaskLogDTO> 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<DatasetTableTaskLog> 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<DatasetTableTaskLog> 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;
}
}

118
backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
View File

@ -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("add_scope")){
dataSetTableService.saveIncrementalConfig(dataSetTaskRequest.getDatasetTableIncrementalConfig());
}
// check
if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(),"CRON")){
if (StringUtils.isNotEmpty(datasetTableTask.getCron())) {
@ -67,34 +81,48 @@ 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());
datasetTableTaskMapper.insert(datasetTableTask);
} else {
datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
}
scheduleService.addSchedule(datasetTableTask);
if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString()) && datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Underway.name())) { // SIMPLE 类型，提前占位
execNow(datasetTableTask);
datasetTableTask.setLastExecStatus(JobStatus.Underway.name());
datasetTableTask.setLastExecTime(System.currentTimeMillis());
update(datasetTableTask);
}
if(!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.name())){
scheduleService.addSchedule(datasetTableTask);
}else {
if(datasetTableTask.getStatus().equalsIgnoreCase(JobStatus.Underway.name())){
scheduleService.addSchedule(datasetTableTask);
}
}
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.existSyncTask(dataSetTableService.get(datasetTableTask.getTableId()), null)) {
DataEaseException.throwException(Translator.get("i18n_sync_job_exists"));
}
//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 +149,34 @@ public class DataSetTableTaskService {
}
public void update(DatasetTableTask datasetTableTask) {
datasetTableTaskMapper.updateByPrimaryKey(datasetTableTask);
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);
}
public List<DatasetTableTask> 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<DataSetTaskDTO> taskList(BaseGridRequest request) {
GridExample gridExample = request.convertExample();
List<DataSetTaskDTO> dataSetTaskDTOS = extDataSetTaskMapper.taskList(gridExample);
return dataSetTaskDTOS;
}
private void checkName(DataSetTaskRequest dataSetTaskRequest) {
DatasetTableTaskExample datasetTableTaskExample = new DatasetTableTaskExample();
DatasetTableTaskExample.Criteria criteria = datasetTableTaskExample.createCriteria();
@ -151,4 +194,29 @@ 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{
execNow(datasetTableTask);
// datasetTableTask.setStatus(TaskStatus.Underway.name());
datasetTableTask.setLastExecStatus(JobStatus.Underway.name());
datasetTableTask.setLastExecTime(System.currentTimeMillis());
update(datasetTableTask);
if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.CRON.toString())){
scheduleService.fireNow(datasetTableTask);
}
if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
scheduleService.addSchedule(datasetTableTask);
}
}
}

89
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -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;
@ -134,28 +131,48 @@ public class ExtractDataService {
"fi\n" +
"rm -rf %s\n";
public synchronized boolean updateSyncStatusIsNone(DatasetTable datasetTable ){
public synchronized boolean existSyncTask(DatasetTable datasetTable, DatasetTableTask datasetTableTask){
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;
Boolean existSyncTask = datasetTableMapper.updateByExampleSelective(datasetTable, example) == 0;
if(existSyncTask){
if(datasetTableTask != null){
DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
datasetTableTaskLog.setTaskId(datasetTableTask.getId());
datasetTableTaskLog.setTableId(datasetTable.getId());
datasetTableTaskLog.setStatus(JobStatus.Underway.name());
List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.select(datasetTableTaskLog);
if(CollectionUtils.isNotEmpty(datasetTableTaskLogs) && datasetTableTaskLogs.get(0).getTriggerType().equalsIgnoreCase(TriggerType.Custom.name())){
return false;
}
}
return true;
}else {
return false;
}
}
public void extractData(String datasetTableId, String taskId, String type, JobExecutionContext context) {
DatasetTable datasetTable = getDatasetTable(datasetTableId);
if(datasetTable == null){
LogUtil.error("Can not find DatasetTable: " + datasetTableId);
}
DatasetTableTask datasetTableTask = datasetTableTaskMapper.selectByPrimaryKey(taskId);
boolean isCronJob = (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.CRON.toString()));
if(updateSyncStatusIsNone(datasetTable) && isCronJob){
LogUtil.info("Skip synchronization task for table : " + datasetTableId);
return;
}
DatasetTableTask datasetTableTask = datasetTableTaskMapper.selectByPrimaryKey(taskId);
if(datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Stopped.name()) && !datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.name())){
LogUtil.info("Skip synchronization task, task ID : " + datasetTableTask.getId());
return;
}
if(existSyncTask(datasetTable, datasetTableTask)){
LogUtil.info("Skip synchronization task for dataset, dataset ID : " + 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,20 +224,29 @@ public class ExtractDataService {
sendWebMsg(datasetTable, taskId,true);
// deleteFile("all_scope", datasetTableId);
deleteFile("all_scope", datasetTableId);
updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime);
// if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
// datasetTableTask.setStatus(TaskStatus.Stopped.name());
// }
datasetTableTask.setLastExecStatus(JobStatus.Completed.name());
dataSetTableTaskService.update(datasetTableTask);
}catch (Exception e){
saveErrorLog(datasetTableId, taskId, e);
datasetTableTask.setLastExecStatus(JobStatus.Error.name());
// if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
// datasetTableTask.setStatus(TaskStatus.Stopped.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());
dataSetTableTaskService.update(datasetTableTask);
}
}
break;
@ -274,22 +300,28 @@ 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());
// if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
// datasetTableTask.setStatus(TaskStatus.Stopped.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());
// if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
// datasetTableTask.setStatus(TaskStatus.Stopped.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());
dataSetTableTaskService.update(datasetTableTask);
}
}
break;
}
@ -435,6 +467,7 @@ public class ExtractDataService {
datasetTableTaskLog.setTableId(datasetTableId);
datasetTableTaskLog.setTaskId(taskId);
datasetTableTaskLog.setStatus(JobStatus.Underway.name());
datasetTableTaskLog.setTriggerType(TriggerType.Cron.name());
List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.select(datasetTableTaskLog);
if(CollectionUtils.isEmpty(datasetTableTaskLogs)){
datasetTableTaskLog.setStartTime(System.currentTimeMillis());

14
backend/src/main/resources/db/migration/V12__system_task.sql Normal file
View File

@ -0,0 +1,14 @@
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, 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';
ALTER TABLE `dataset_table_task_log` ADD COLUMN `trigger_type` VARCHAR(45) NULL AFTER `create_time`;
update dataset_table_task_log set trigger_type='Cron';

17
frontend/src/api/dataset/dataset.js
View File

@ -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 }

1
frontend/src/icons/svg/task.svg Normal file
View File

@ -0,0 +1 @@
<svg t="1625478118793" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1202" width="200" height="200"><path d="M585.142857 804.571429h365.714286v-73.142858H585.142857v73.142858z m-219.428571-292.571429h585.142857v-73.142857H365.714286v73.142857z m365.714285-292.571429h219.428572V146.285714h-219.428572v73.142857z m292.571429 475.428572v146.285714c0 20.004571-16.566857 36.571429-36.571429 36.571429H36.571429c-20.004571 0-36.571429-16.566857-36.571429-36.571429v-146.285714c0-20.004571 16.566857-36.571429 36.571429-36.571429h950.857142c20.004571 0 36.571429 16.566857 36.571429 36.571429z m0-292.571429v146.285715c0 20.004571-16.566857 36.571429-36.571429 36.571428H36.571429c-20.004571 0-36.571429-16.566857-36.571429-36.571428v-146.285715c0-20.004571 16.566857-36.571429 36.571429-36.571428h950.857142c20.004571 0 36.571429 16.566857 36.571429 36.571428z m0-292.571428v146.285714c0 20.004571-16.566857 36.571429-36.571429 36.571429H36.571429c-20.004571 0-36.571429-16.566857-36.571429-36.571429V109.714286c0-20.004571 16.566857-36.571429 36.571429-36.571429h950.857142c20.004571 0 36.571429 16.566857 36.571429 36.571429z" fill="" p-id="1203"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

17
frontend/src/lang/en.js
View File

@ -921,6 +921,23 @@ export default {
char_can_not_more_50: 'Dataset name can not more 50',
task_add_title: 'Add Task',
task_edit_title: 'Edit Task',
task: {
list: 'Task list',
record: 'Execution record',
create: 'New task',
name: 'Task name',
last_exec_time: 'Last execution time',
next_exec_time: 'Next execution time',
last_exec_status: 'Last execution result',
task_status: 'Task status',
dataset: 'Data set',
search_by_name: 'Search by name',
underway: 'Running',
stopped: 'Stopped',
exec: 'Execute',
confirm_exec: 'Manual trigger execution？',
change_success: 'State switch successful'
},
field_group_type: 'Type',
location: 'Location'
},

17
frontend/src/lang/tw.js
View File

@ -921,6 +921,23 @@ export default {
char_can_not_more_50: '數據集名稱不能超過50個字符',
task_add_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: '手動觸發執行？',
change_success: '狀態切換成功'
},
field_group_type: '分類',
location: '地理位置'
},

17
frontend/src/lang/zh.js
View File

@ -921,6 +921,23 @@ export default {
char_can_not_more_50: '数据集名称不能超过50个字符',
task_add_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: '手动触发执行？',
change_success: '状态切换成功'
},
field_group_type: '分类',
location: '地理位置'
},

3
frontend/src/utils/webMsg.js
View File

@ -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' }

41
frontend/src/views/chart/group/Group.vue
View File

@ -7,20 +7,9 @@
{{ $t('chart.datalist') }}
</span>
<el-button icon="el-icon-plus" type="text" size="mini" style="float: right;" @click="add('group')">
<!-- {{ $t('chart.add_group') }}-->
</el-button>
</el-row>
<el-divider />
<!-- <el-row>-->
<!-- <el-button type="primary" size="mini" @click="add('group')">-->
<!-- {{ $t('chart.add_group') }}-->
<!-- </el-button>-->
<!-- <el-button type="primary" size="mini" @click="add('scene')">-->
<!-- {{ $t('chart.add_scene') }}-->
<!-- </el-button>-->
<!-- </el-row>-->
<el-row>
<el-form>
<el-form-item class="form-item">
@ -53,14 +42,6 @@
>
<span v-if="data.type ==='group'" slot-scope="{ node, data }" class="custom-tree-node father">
<span style="display: flex;flex: 1;width: 0;">
<!-- <span v-if="data.type === 'scene'">-->
<!-- &lt;!&ndash; <el-button&ndash;&gt;-->
<!-- &lt;!&ndash; icon="el-icon-folder-opened"&ndash;&gt;-->
<!-- &lt;!&ndash; type="text"&ndash;&gt;-->
<!-- &lt;!&ndash; size="mini"&ndash;&gt;-->
<!-- &lt;!&ndash; />&ndash;&gt;-->
<!-- <svg-icon icon-class="scene" class="ds-icon-scene" />-->
<!-- </span>-->
<span>
<i class="el-icon-folder" />
</span>
@ -80,9 +61,6 @@
<el-dropdown-item icon="el-icon-folder-add" :command="beforeClickAdd('group',data,node)">
{{ $t('chart.group') }}
</el-dropdown-item>
<!-- <el-dropdown-item icon="el-icon-folder-add" :command="beforeClickAdd('scene',data,node)">-->
<!-- {{ $t('chart.scene') }}-->
<!-- </el-dropdown-item>-->
<el-dropdown-item icon="el-icon-circle-plus" :command="beforeClickAdd('chart',data,node)">
{{ $t('chart.add_chart') }}
</el-dropdown-item>
@ -691,25 +669,10 @@ export default {
if (data.type !== 'group') {
this.$emit('switchComponent', { name: 'ChartEdit', param: data })
}
// 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: '' })
},
@ -718,13 +681,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

20
frontend/src/views/chart/view/TableSelector.vue
View File

@ -1,7 +1,7 @@
<template>
<de-container>
<de-aside-container>
<dataset-group-selector-tree @getTable="getTable" />
<dataset-group-selector-tree @getTable="getTable" :mode=mode :type=type :showMode=showMode />
</de-aside-container>
<de-main-container>
@ -15,7 +15,6 @@ import DeMainContainer from '@/components/dataease/DeMainContainer'
import DeContainer from '@/components/dataease/DeContainer'
import DeAsideContainer from '@/components/dataease/DeAsideContainer'
// import DatasetGroupSelector from '../../dataset/common/DatasetGroupSelector'
import DatasetGroupSelectorTree from '../../dataset/common/DatasetGroupSelectorTree'
import DatasetTableData from '../../dataset/common/DatasetTableData'
import { getTable } from '@/api/dataset/dataset'
@ -26,6 +25,23 @@ export default {
DatasetTableData,
DeMainContainer, DeContainer, DeAsideContainer, DatasetGroupSelectorTree
},
props: {
mode: {
type: Number,
required: false,
default: -1
},
type: {
type: String,
required: false,
default: null
},
showMode: {
type: String,
required: false,
default: null
}
},
data() {
return {
table: {}

26
frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
View File

@ -41,11 +41,6 @@
<span v-if="data.type === 'group'" slot-scope="{ node, data }" class="custom-tree-node">
<span style="display: flex;flex: 1;width: 0;">
<span v-if="data.type === 'scene'">
<!-- <el-button-->
<!-- icon="el-icon-folder-opened"-->
<!-- type="text"-->
<!-- size="mini"-->
<!-- />-->
<svg-icon icon-class="scene" class="ds-icon-scene" />
</span>
<span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
@ -95,6 +90,11 @@ export default {
required: false,
default: -1
},
type: {
type: String,
required: false,
default: null
},
unionData: {
type: Array,
required: false,
@ -184,7 +184,6 @@ export default {
},
mounted() {
this.treeNode(this.groupForm)
// this.tableTree()
},
created() {
this.kettleState()
@ -261,20 +260,6 @@ export default {
if (data.type !== 'group') {
this.sceneClick(data, node)
}
// if (data.type === 'scene') {
// this.sceneMode = true
// this.currGroup = data
// this.tableTree()
// }
// if (node.expanded) {
// this.expandedArray.push(data.id)
// } else {
// const index = this.expandedArray.indexOf(data.id)
// if (index > -1) {
// this.expandedArray.splice(index, 1)
// }
// }
// console.log(this.expandedArray);
},
back() {
@ -364,6 +349,7 @@ export default {
sort: 'type asc,name asc,create_time desc',
sceneId: node.data.id,
mode: this.mode < 0 ? null : this.mode,
type: this.type,
typeFilter: this.customType ? this.customType : null
}, false).then(response => {
this.tables = response.data

4
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -472,7 +472,6 @@ export default {
post('/dataset/table/incrementalConfig', { tableId: this.table.id }).then(response => {
this.incrementalConfig = response.data
this.incrementalUpdateType = 'incrementalAdd'
// console.log(this.sql)
if (this.incrementalConfig.incrementalAdd) {
this.sql = this.incrementalConfig.incrementalAdd
} else {
@ -555,7 +554,8 @@ export default {
}
},
listTaskLog(loading = true) {
post('/dataset/taskLog/list/' + this.page.currentPage + '/' + this.page.pageSize, { tableId: this.table.id }, loading).then(response => {
const params = {"conditions":[{"field":"dataset_table_task.table_id","operator":"eq","value": this.table.id}],"orders":[]}
post('/dataset/taskLog/list/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
this.taskLogData = response.data.listObject
this.page.total = response.data.itemCount
})

558
frontend/src/views/system/task/DatasetTaskList.vue Normal file
View File

@ -0,0 +1,558 @@
<template>
<el-col>
<el-row style="margin-top: 10px;">
<complex-table :data="data" :columns="columns" local-key="datasetTask" :search-config="searchConfig" :pagination-config="paginationConfig" @select="select" @search="search" @sort-change="sortChange">
<template #toolbar>
<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="datasetName" :label="$t('dataset.task.dataset')" />
<el-table-column prop="rate" :label="$t('dataset.execute_rate')">
<template slot-scope="scope">
<span v-if="scope.row.rate === 'SIMPLE'">{{ $t('dataset.execute_once') }}</span>
<span v-if="scope.row.rate === 'SIMPLE_COMPLETE'">{{ $t('dataset.execute_once') }}</span>
<span v-if="scope.row.rate === 'CRON'">{{ $t('dataset.cron_config') }}</span>
</template>
</el-table-column>
<el-table-column prop="lastExecTime" :label="$t('dataset.task.last_exec_time')">
<template slot-scope="scope" >
<span v-if="scope.row.lastExecTime && scope.row.lastExecTime != -1">
{{ scope.row.lastExecTime | timestampFormatDate }}
</span>
<span v-if="scope.row.lastExecTime === -1">--</span>
</template>
</el-table-column>
<el-table-column prop="lastExecStatus" :label="$t('dataset.task.last_exec_status')" >
<template slot-scope="scope">
<span v-if="scope.row.lastExecStatus === 'Completed'" style="color: green">{{ $t('dataset.completed') }}</span>
<span v-if="scope.row.lastExecStatus === 'Underway'" style="color: blue">
<i class="el-icon-loading" />
{{ $t('dataset.underway') }}
</span>
<span v-if="scope.row.lastExecStatus === 'Error'" style="color: #ff0000">
{{ $t('dataset.error') }}
</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">
{{ scope.row.nextExecTime | timestampFormatDate }}
</span>
<span v-if="!scope.row.nextExecTime">--</span>
</template>
</el-table-column>
<el-table-column prop="status" :label="$t('dataset.task.task_status')">
<template slot-scope="scope">
<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'">
<el-link type="danger" style="font-size: 12px" @click="changeTaskStatus(scope.row)">{{ $t('dataset.task.stopped') }}</el-link>
</span>
</template>
</el-table-column>
<fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
</complex-table>
</el-row>
<el-dialog v-dialogDrag :title="update_task_dialog_title" :visible="update_task" :show-close="false" width="50%" class="dialog-css" append-to-body>
<el-col>
<el-form :form="taskForm" label-width="100px" size="mini">
<el-form-item :label="$t('dataset.task_name')" prop="name">
<el-input v-model="taskForm.name" size="mini" style="width: 50%" :placeholder="$t('dataset.task_name')"/>
</el-form-item>
<el-form-item :label="$t('dataset.update_type')" prop="type">
<el-select v-model="taskForm.type" size="mini">
<el-option :label="$t('dataset.all_scope')" value="all_scope"/>
<el-option :label="$t('dataset.add_scope')" value="add_scope"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('dataset.execute_rate')" prop="rate">
<el-select v-model="taskForm.rate" size="mini" @change="onRateChange">
<el-option :label="$t('dataset.execute_once')" value="SIMPLE"/>
<el-option :label="$t('dataset.cron_config')" value="CRON"/>
</el-select>
</el-form-item>
<el-form-item v-if="taskForm.rate === 'CRON'" label="">
<el-popover v-model="cronEdit">
<cron v-model="taskForm.cron" @close="cronEdit = false" />
<el-input slot="reference" v-model="taskForm.cron" size="mini" style="width: 50%" @click="cronEdit = true" />
</el-popover>
</el-form-item>
<el-form-item v-if="taskForm.rate === 'CRON'" :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-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"/>
</el-select>
</el-form-item>
<el-form-item v-if="taskForm.end === '1'" label="">
<el-date-picker v-model="taskForm.endTime" type="datetime" :placeholder="$t('dataset.select_data_time')" size="mini"/>
</el-form-item>
<el-form-item v-if="taskForm.type === 'add_scope'" :label="$t('dataset.incremental_update_type')">
<el-radio-group v-model="incrementalUpdateType" size="mini" @change="incrementalUpdateTypeChange">
<el-radio label="incrementalAdd">{{ $t('dataset.incremental_add') }}</el-radio>
<el-radio label="incrementalDelete">{{ $t('dataset.incremental_delete') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="taskForm.type === 'add_scope'" :label="$t('dataset.param')">
<el-button type="text" size="mini" @click="insertParamToCodeMirror('${__last_update_time__}')">{{ $t('dataset.last_update_time') }}</el-button>
<el-button type="text" size="mini" @click="insertParamToCodeMirror('${__current_update_time__}')">{{ $t('dataset.current_update_time') }}</el-button>
</el-form-item>
<codemirror v-if="taskForm.type === 'add_scope'"
ref="myCm"
v-model="sql"
class="codemirror"
:options="sqlOption"
@ready="onCmReady"
@focus="onCmFocus"
@input="onCmCodeChange"
/>
</el-form>
</el-col>
<div slot="footer" class="dialog-footer">
<el-button size="mini" @click="closeTask">{{ $t('dataset.cancel') }}</el-button>
<el-button type="primary" size="mini" @click="saveTask(taskForm)">{{ $t('dataset.confirm') }}</el-button>
</div>
</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">
<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>
<el-button type="primary" size="mini" :disabled="!table.id" @click="create(undefined)">{{ $t('chart.confirm') }}</el-button>
</div>
</el-dialog>
</el-col>
</template>
<script>
import ComplexTable from '@/components/business/complex-table'
import { formatCondition, formatQuickCondition, addOrder, formatOrders } from '@/utils/index'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {datasetTaskList, post} from '@/api/dataset/dataset'
import { codemirror } from 'vue-codemirror'
import 'codemirror/lib/codemirror.css'
import 'codemirror/theme/solarized.css'
import 'codemirror/mode/sql/sql.js'
import 'codemirror/addon/selection/active-line.js'
import 'codemirror/addon/edit/closebrackets.js'
import 'codemirror/mode/clike/clike.js'
import 'codemirror/addon/edit/matchbrackets.js'
import 'codemirror/addon/comment/comment.js'
import 'codemirror/addon/dialog/dialog.js'
import 'codemirror/addon/dialog/dialog.css'
import 'codemirror/addon/search/searchcursor.js'
import 'codemirror/addon/search/search.js'
import 'codemirror/keymap/emacs.js'
import 'codemirror/addon/hint/show-hint.css'
import 'codemirror/addon/hint/sql-hint'
import 'codemirror/addon/hint/show-hint'
import cron from '@/components/cron/cron'
import TableSelector from '@/views/chart/view/TableSelector'
export default {
name: 'DatasetTaskList',
components: { ComplexTable, cron, codemirror, TableSelector },
data() {
return {
taskForm: {
name: '',
type: 'all_scope',
startTime: '',
rate: 'SIMPLE',
cron: '',
endTime: '',
end: '0'
},
update_task: false,
header: '',
columns: [],
buttons: [
{
label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.addTask
},
{
label: this.$t('dataset.task.exec'), icon: 'el-icon-video-play', type: 'success', click: this.execTask, disabled: this.disableExec
},
{
label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.deleteTask
}
],
searchConfig: {
useQuickSearch: true,
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.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 }
]
},
paginationConfig: {
currentPage: 1,
pageSize: 10,
total: 0
},
data: [],
dialogVisible: false,
editPasswordVisible: false,
form: {
roles: [{
id: ''
}]
},
checkPasswordForm: {},
ruleForm: {},
defaultForm: { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 1, deptId: null, phone: null },
depts: null,
roles: [],
roleDatas: [],
userRoles: [],
formType: 'add',
permission: {
add: ['user:add'],
edit: ['user:edit'],
del: ['user:del'],
editPwd: ['user:editPwd']
},
orderConditions: [],
last_condition: null,
update_task_dialog_title: '',
sqlOption: {
tabSize: 2,
styleActiveLine: true,
lineNumbers: true,
line: true,
mode: 'text/x-sql',
theme: 'solarized',
hintOptions: { // 自定义提示选项
completeSingle: false // 当匹配只有一项的时候是否自动补全
}
},
incrementalUpdateType: 'incrementalAdd',
sql: '',
incrementalConfig: {},
cronEdit: false,
lang: this.$store.getters.language === 'en_US' ? 'en' : 'cn',
selectDatasetFlag: false,
table: {},
}
},
computed: {
codemirror() {
return this.$refs.myCm.codemirror
}
},
created() {
this.search()
this.timer = setInterval(() => {
this.search()
}, 5000)
},
beforeDestroy() {
clearInterval(this.timer)
},
methods: {
sortChange( { column, prop, order } ) {
this.orderConditions = []
if (!order) {
this.search(this.last_condition)
return
}
if (prop === 'dept') {
prop = 'u.deptId'
}
if (prop === 'status') {
prop = 'u.enabled'
}
this.orderConditions = []
addOrder({ field: prop, value: order }, this.orderConditions)
this.search(this.last_condition)
},
select(selection) {
},
search(condition) {
this.last_condition = condition
condition = formatQuickCondition(condition, 'dataset_table_task.name')
const temp = formatCondition(condition)
const param = temp || {}
param['orders'] = formatOrders(this.orderConditions)
const { currentPage, pageSize } = this.paginationConfig
datasetTaskList(currentPage, pageSize, param).then(response => {
this.data = response.data.listObject
this.data.forEach(item => {
this.taskStatus(item)
})
this.paginationConfig.total = response.data.itemCount
})
},
taskStatus(item) {
post('/dataset/task/lastExecStatus', item).then(response => {
if(!item.lastExecStatus) {
item.lastExecStatus = response.data.lastExecStatus
}
if(!item.lastExecTime) {
item.lastExecTime = response.data.lastExecTime
}
})
},
create(task) {
if (!task) { // add
this.selectDatasetFlag = false
this.resetTaskForm()
this.taskForm.name = this.table.name + ' ' + this.$t('dataset.task_update')
this.taskForm.tableId = this.table.id
this.taskForm.startTime = new Date()
this.update_task_dialog_title = this.$t('dataset.task_add_title')
} else { // update
this.taskForm = JSON.parse(JSON.stringify(task))
this.update_task_dialog_title = this.$t('dataset.task_edit_title')
}
this.update_task = true
},
changeTaskStatus(task){
const param = task;
param.status = task.status === 'Underway' ? 'Stopped' : 'Underway'
post('/dataset/task/updateStatus', task).then(response => {
task.status = param.status;
this.$message({
message: this.$t('dataset.task.change_success'),
type: 'success',
showClose: true
})
})
},
execTask(task){
this.$confirm(this.$t('dataset.task.confirm_exec'), this.$t('dataset.tips'), {
confirmButtonText: this.$t('dataset.confirm'),
cancelButtonText: this.$t('dataset.cancel'),
type: 'warning'
}).then(() => {
post('/dataset/task/execTask', task).then(response => {
this.search()
})
}).catch(() => {
})
},
selectDataset() {
this.selectDatasetFlag = true
},
getTable(table) {
this.table = JSON.parse(JSON.stringify(table))
},
closeCreateTask() {
this.selectDatasetFlag = false
this.table = {}
},
resetTaskForm() {
this.taskForm = {
name: '',
type: 'all_scope',
startTime: '',
rate: 'SIMPLE',
endTime: '',
end: '0'
}
},
incrementalUpdateTypeChange: function() {
if (this.incrementalUpdateType === 'incrementalAdd') {
if (this.sql) {
this.incrementalConfig.incrementalDelete = this.sql
} else {
this.incrementalConfig.incrementalDelete = ''
}
if (this.incrementalConfig.incrementalAdd) {
this.sql = this.incrementalConfig.incrementalAdd
} else {
this.sql = ''
}
}
if (this.incrementalUpdateType === 'incrementalDelete') {
if (this.sql) {
this.incrementalConfig.incrementalAdd = this.sql
} else {
this.incrementalConfig.incrementalAdd = ''
}
if (this.incrementalConfig.incrementalDelete) {
this.sql = this.incrementalConfig.incrementalDelete
} else {
this.sql = ''
}
}
},
showSQL(val) {
this.sql = val || ''
},
onCmReady(cm) {
this.codemirror.setSize('-webkit-fill-available', 'auto')
},
onCmFocus(cm) {
},
onCmCodeChange(newCode) {
this.sql = newCode
this.$emit('codeChange', this.sql)
},
insertParamToCodeMirror(param) {
const pos1 = this.$refs.myCm.codemirror.getCursor()
const pos2 = {}
pos2.line = pos1.line
pos2.ch = pos1.ch
this.$refs.myCm.codemirror.replaceRange(param, pos2)
},
cronChange(val) {
this.taskForm.cron = val
},
disableExec(task) {
return task.status === 'Stopped'
},
deleteTask(task) {
this.$confirm(this.$t('dataset.confirm_delete'), this.$t('dataset.tips'), {
confirmButtonText: this.$t('dataset.confirm'),
cancelButtonText: this.$t('dataset.cancel'),
type: 'warning'
}).then(() => {
post('/dataset/task/delete/' + task.id, null).then(response => {
this.$message({
message: this.$t('dataset.delete_success'),
type: 'success',
showClose: true
})
this.search()
})
}).catch(() => {
})
},
addTask(task) {
if (!task) { // add
this.resetTaskForm()
this.taskForm.name = this.table.name + ' ' + this.$t('dataset.task_update')
this.taskForm.startTime = new Date()
this.update_task_dialog_title = this.$t('dataset.task_add_title')
} else { // update
this.getIncrementalConfig(task.tableId)
this.taskForm = JSON.parse(JSON.stringify(task))
this.update_task_dialog_title = this.$t('dataset.task_edit_title')
}
this.update_task = true
},
getIncrementalConfig(tableId) {
post('/dataset/table/incrementalConfig', { tableId: tableId }).then(response => {
this.incrementalConfig = response.data
this.incrementalUpdateType = 'incrementalAdd'
if (this.incrementalConfig.incrementalAdd) {
this.sql = this.incrementalConfig.incrementalAdd
} else {
this.sql = ''
}
})
},
closeTask() {
this.update_task = false
this.resetTaskForm()
},
saveTask(task) {
if (task.rate !== 'SIMPLE') {
if (this.incrementalUpdateType === 'incrementalAdd') {
this.incrementalConfig.incrementalAdd = this.sql
} else {
this.incrementalConfig.incrementalDelete = this.sql
}
this.incrementalConfig.tableId = task.tableId
}
task.startTime = new Date(task.startTime).getTime()
task.endTime = new Date(task.endTime).getTime()
const dataSetTaskRequest = {
datasetTableTask: task,
datasetTableIncrementalConfig: task.type === 'add_scope' ? this.incrementalConfig : undefined
}
post('/dataset/task/save', dataSetTaskRequest).then(response => {
this.$message({
message: this.$t('dataset.save_success'),
type: 'success',
showClose: true
})
this.update_task = false
this.resetTaskForm()
this.search()
})
},
onRateChange() {
if (this.taskForm.rate === 'SIMPLE') {
this.taskForm.end = '0'
this.taskForm.endTime = ''
this.taskForm.cron = ''
} else {
this.taskForm.cron = '00 00 * ? * * *'
}
},
handleClose() {
this.depts = null
this.formType = 'add'
this.form = {}
this.editPasswordVisible = false
this.dialogVisible = false
},
btnDisabled(row) {
return row.userId === 1
}
}
}
</script>
<style scoped>
.el-divider--horizontal {
margin: 12px 0;
}
.el-radio{
margin-right: 10px;
}
.el-radio>>>.el-radio__label{
font-size: 12px;
}
.dialog-css >>> .el-dialog__header {
padding: 20px 20px 0;
}
.dialog-css >>> .el-dialog__body {
padding: 10px 20px 20px;
}
.el-form-item {
margin-bottom: 10px;
}
.codemirror {
height: 100px;
overflow-y: auto;
}
.codemirror >>> .CodeMirror-scroll {
height: 100px;
overflow-y: auto;
}
span{
font-size: 12px;
}
</style>

181
frontend/src/views/system/task/TaskRecord.vue Normal file
View File

@ -0,0 +1,181 @@
<template>
<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="startTime" :label="$t('dataset.start_time')">
<template slot-scope="scope">
<span>{{ scope.row.startTime | timestampFormatDate }}</span>
</template>
</el-table-column>
<el-table-column prop="endTime" :label="$t('dataset.end_time')">
<template slot-scope="scope">
<span>{{ scope.row.endTime | timestampFormatDate }}</span>
</template>
</el-table-column>
<el-table-column prop="status" :label="$t('dataset.status')">
<template slot-scope="scope">
<span v-if="scope.row.status === 'Completed'" style="color: green">{{ $t('dataset.completed') }}</span>
<span v-if="scope.row.status === 'Underway'" style="color: blue">
<i class="el-icon-loading" />
{{ $t('dataset.underway') }}
</span>
<span v-if="scope.row.status === 'Error'" style="color: red">
<el-link type="danger" style="font-size: 12px" @click="showErrorMassage(scope.row.info)">{{ $t('dataset.error') }}</el-link>
</span>
</template>
</el-table-column>
</complex-table>
</el-row>
</el-col>
</template>
<script>
import LayoutContent from '@/components/business/LayoutContent'
import ComplexTable from '@/components/business/complex-table'
import { formatCondition, formatQuickCondition, addOrder, formatOrders } from '@/utils/index'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { post} from '@/api/dataset/dataset'
import cron from '@/components/cron/cron'
import TableSelector from '@/views/chart/view/TableSelector'
export default {
name: 'TaskRecord',
components: { ComplexTable, LayoutContent, cron, TableSelector},
data() {
return {
header: '',
columns: [],
buttons: [
{
label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
show: this.checkPermission(['user:edit'])
}
],
searchConfig: {
useQuickSearch: true,
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_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: {
currentPage: 1,
pageSize: 10,
total: 0
},
data: [],
dialogVisible: false,
editPasswordVisible: false,
form: {
roles: [{
id: ''
}]
},
checkPasswordForm: {},
ruleForm: {},
defaultForm: { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 1, deptId: null, phone: null },
depts: null,
roles: [],
roleDatas: [],
userRoles: [],
formType: 'add',
orderConditions: [],
last_condition: null,
}
},
created() {
this.search()
this.timer = setInterval(() => {
this.search()
}, 5000)
},
computed: {
},
beforeDestroy() {
clearInterval(this.timer)
},
methods: {
sortChange({ column, prop, order }) {
this.orderConditions = []
if (!order) {
this.search(this.last_condition)
return
}
if (prop === 'dept') {
prop = 'u.deptId'
}
if (prop === 'status') {
prop = 'u.enabled'
}
this.orderConditions = []
addOrder({ field: prop, value: order }, this.orderConditions)
this.search(this.last_condition)
},
select(selection) {
},
search(condition) {
this.last_condition = condition
console.log(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 => {
this.data = response.data.listObject
this.paginationConfig.total = response.data.itemCount
})
},
deleteTask(task) {
this.$confirm(this.$t('dataset.confirm_delete'), this.$t('dataset.tips'), {
confirmButtonText: this.$t('dataset.confirm'),
cancelButtonText: this.$t('dataset.cancel'),
type: 'warning'
}).then(() => {
post('/dataset/task/delete/' + task.id, null).then(response => {
this.$message({
message: this.$t('dataset.delete_success'),
type: 'success',
showClose: true
})
this.search()
})
}).catch(() => {
})
}
}
}
</script>
<style scoped>
.el-divider--horizontal {
margin: 12px 0;
}
.el-radio{
margin-right: 10px;
}
.el-radio>>>.el-radio__label{
font-size: 12px;
}
.dialog-css >>> .el-dialog__header {
padding: 20px 20px 0;
}
.dialog-css >>> .el-dialog__body {
padding: 10px 20px 20px;
}
.el-form-item {
margin-bottom: 10px;
}
span{
font-size: 12px;
}
</style>

65
frontend/src/views/system/task/dataset.vue Normal file
View File

@ -0,0 +1,65 @@
<template>
<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-tab-pane :label="$t('dataset.task.list')" name="DatasetTaskList">
<dataset-task-list />
</el-tab-pane>
<el-tab-pane :label="$t('dataset.task.record')" name="TaskRecord">
<task-record />
</el-tab-pane>
</el-tabs>
</el-row>
</layout-content>
</template>
<script>
import LayoutContent from '@/components/business/LayoutContent'
import ComplexTable from '@/components/business/complex-table'
import UnionView from "@/views/dataset/data/UnionView";
import UpdateInfo from "@/views/dataset/data/UpdateInfo";
import DatasetTaskList from "@/views/system/task/DatasetTaskList";
import TaskRecord from "@/views/system/task/TaskRecord";
import TabDataPreview from "@/views/dataset/data/TabDataPreview";
import DatasetTableData from "@/views/dataset/common/DatasetTableData";
export default {
components: {DatasetTableData, LayoutContent, ComplexTable,UnionView, UpdateInfo, TabDataPreview, DatasetTaskList, TaskRecord},
data() {
return {
tabActive: 'DatasetTaskList',
}
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.de-msg-radio-class {
padding: 0 5px;
>>>.el-radio-button__inner {
border-radius: 4px 4px 4px 4px !important;
border-left: 1px solid #dcdfe6 !important;
padding: 10px 10px;
}
>>>.el-radio-button__orig-radio:checked+.el-radio-button__inner {
color: #fff;
background-color: #0a7be0;
border-color: #0a7be0;
-webkit-box-shadow: 0px 0 0 0 #0a7be0;
box-shadow: 0px 0 0 0 #0a7be0;
}
}
.de-msg-a:hover {
text-decoration: underline !important;
color: #0a7be0 !important;
cursor: pointer !important;
}
</style>

21
frontend/src/views/system/task/index.vue Normal file
View File

@ -0,0 +1,21 @@
<template>
<router-view />
</template>
<script>
export default ({
data() {
return {
}
},
created() {
this.$store.dispatch('app/toggleSideBarHide', false)
},
method: {
}
})
</script>

1
frontend/src/views/system/user/index.vue
View File

@ -12,7 +12,6 @@
>
<template #toolbar>
<el-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" @click="create">{{ $t('user.create') }}</el-button>
<!-- <fu-table-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" :label="$t('user.create')" @click="create" /> -->
</template>
<el-table-column prop="username" label="ID" />