diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/JobBatchSummaryResponseDO.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/JobBatchSummaryResponseDO.java index f62099194..2a5a46379 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/JobBatchSummaryResponseDO.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/JobBatchSummaryResponseDO.java @@ -29,6 +29,11 @@ public class JobBatchSummaryResponseDO { */ private Long jobId; + /** + * 工作流任务id + */ + //private Long workflowId; + /** * 任务批次状态 */ diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java index baeb84bb5..2efd03264 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java @@ -25,19 +25,23 @@ public interface JobSummaryMapper extends BaseMapper { IPage jobTaskList(@Param("namespaceId") String namespaceId, @Param("groupNames") List groupNames, Page page); - List jobLineList(@Param("namespaceId") String namespaceId, - @Param("groupNames") List groupNames, - @Param("groupName") String groupName, - @Param("type") String type, - @Param("from") LocalDateTime from, - @Param("to") LocalDateTime to); + List jobLineList( + @Param("systemTaskType") Integer systemTaskType, + @Param("namespaceId") String namespaceId, + @Param("groupNames") List groupNames, + @Param("groupName") String groupName, + @Param("dateFormat") String dateFormat, + @Param("from") LocalDateTime from, + @Param("to") LocalDateTime to); - DashboardCardResponseDO.JobTask toJobTask(@Param("namespaceId") String namespaceId, @Param("groupNames") List groupNames); - - List dashboardRank(@Param("namespaceId") String namespaceId, - @Param("groupNames") List groupNames, - @Param("groupName") String groupName, - @Param("startTime") LocalDateTime startTime, - @Param("endTime") LocalDateTime endTime + List dashboardRank( + @Param("systemTaskType") Integer systemTaskType, + @Param("namespaceId") String namespaceId, + @Param("groupNames") List groupNames, + @Param("groupName") String groupName, + @Param("startTime") LocalDateTime startTime, + @Param("endTime") LocalDateTime endTime ); + + DashboardCardResponseDO.JobTask toJobTask(@Param("systemTaskType") Integer systemTaskType, @Param("namespaceId") String namespaceId, @Param("groupNames") List groupNames); } diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java index 72bbbc33d..e238f9cb1 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java @@ -27,5 +27,7 @@ public interface JobTaskBatchMapper extends BaseMapper { List selectJobBatchListByIds(@Param("ids") List ids); - List summaryJobBatchList(@Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to); + List summaryJobBatchList(@Param("systemTaskType") Integer systemTaskType, @Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to); + + List summaryWorkflowTaskBatchList(@Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to); } diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java index e6d2a12ec..71a3cbcf4 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobSummary.java @@ -92,4 +92,8 @@ public class JobSummary implements Serializable { */ private LocalDateTime updateDt; + /** + * 任务类型 3、JOB任务 4、WORKFLOW任务 + */ + private Integer systemTaskType; } diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml index 572c67615..68cc65f70 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml @@ -20,7 +20,7 @@ INSERT INTO - job_summary (namespace_id, group_name, job_id, trigger_at, + job_summary (namespace_id, group_name, job_id, trigger_at, system_task_type, success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) VALUES @@ -29,6 +29,7 @@ #{item.groupName}, #{item.jobId}, #{item.triggerAt}, + #{item.systemTaskType}, #{item.successNum}, #{item.failNum}, #{item.failReason}, @@ -51,28 +52,11 @@ SELECT - CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id=job_id)) `name`, + + CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = job_id)) `name`, + + + CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = job_id)) `name`, + SUM(fail_num) AS total FROM job_summary @@ -124,6 +114,7 @@ AND trigger_at >= #{startTime} AND trigger_at <= #{endTime} + AND system_task_type = #{systemTaskType} AND namespace_id = #{namespaceId} GROUP BY namespace_id, group_name, job_id HAVING total > 0 diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml index 62fbb987b..182bccd9e 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml @@ -55,9 +55,25 @@ SUM(CASE WHEN (task_batch_status = 5) THEN 1 ELSE 0 END) AS stopNum, SUM(CASE WHEN (task_batch_status = 4) THEN 1 ELSE 0 END) AS failNum FROM job_task_batch - WHERE create_dt BETWEEN #{from} AND #{to} + WHERE system_task_type = #{systemTaskType} AND create_dt BETWEEN #{from} AND #{to} GROUP BY namespace_id, group_name, job_id, task_batch_status, operation_reason + +