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 72bbbc33..3ba0bc2b 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,5 @@ public interface JobTaskBatchMapper extends BaseMapper { List selectJobBatchListByIds(@Param("ids") List ids); - List summaryJobBatchList(@Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to); + List summaryJobBatchList(@Param("type") Integer type, @Param("from") LocalDateTime todayFrom, @Param("to") LocalDateTime to); } 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 62fbb987..362bb68c 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,7 +55,7 @@ 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 = #{type} AND create_dt BETWEEN #{from} AND #{to} GROUP BY namespace_id, group_name, job_id, task_batch_status, operation_reason diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java index b9a62dd4..ed59fe73 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java @@ -6,6 +6,7 @@ import com.aizuda.easy.retry.common.core.util.JsonUtil; import com.aizuda.easy.retry.server.common.Lifecycle; import com.aizuda.easy.retry.server.common.config.SystemProperties; import com.aizuda.easy.retry.server.common.dto.JobTaskBatchReason; +import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum; import com.aizuda.easy.retry.server.common.schedule.AbstractSchedule; import com.aizuda.easy.retry.template.datasource.persistence.dataobject.JobBatchSummaryResponseDO; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobSummaryMapper; @@ -62,14 +63,14 @@ public class JobSummarySchedule extends AbstractSchedule implements Lifecycle { // 定时按日实时查询统计数据(00:00:00 - 23:59:59) LocalDateTime todayFrom = LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(-i); LocalDateTime todayTo = LocalDateTime.of(LocalDate.now(), LocalTime.MAX).plusDays(-i); - List summaryResponseDOList = jobTaskBatchMapper.summaryJobBatchList(todayFrom, todayTo); + List summaryResponseDOList = jobTaskBatchMapper.summaryJobBatchList(SyetemTaskTypeEnum.JOB.getType(), todayFrom, todayTo); if (summaryResponseDOList == null || summaryResponseDOList.size() < 1) { continue; } // insertOrUpdate List jobSummaryList = jobSummaryList(todayFrom, summaryResponseDOList); - int totalJobSummary = jobSummaryMapper.insertOrUpdate(jobSummaryList); + int totalJobSummary = jobSummaryMapper.insertOrUpdate(jobSummaryList); EasyRetryLog.LOCAL.debug("job summary dashboard success todayFrom:[{}] todayTo:[{}] total:[{}]", todayFrom, todayTo, totalJobSummary); } } catch (Exception e) { diff --git a/frontend/src/views/dashboard/Analysis.vue b/frontend/src/views/dashboard/Analysis.vue index 0f31d126..5310f0c8 100644 --- a/frontend/src/views/dashboard/Analysis.vue +++ b/frontend/src/views/dashboard/Analysis.vue @@ -1,7 +1,7 @@ - + @@ -56,7 +56,34 @@ - + + + + + + +
+ + + +
+ +
+
+ +