From 1d30f62edb4cb8c1fec72d64c4268ff6ed278e91 Mon Sep 17 00:00:00 2001 From: zhengweilin Date: Mon, 18 Dec 2023 17:49:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=202.5.0:=201=E3=80=81Dashboard=20=E6=8A=98?= =?UTF-8?q?=E7=BA=BF=E5=9B=BEfail=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF=202?= =?UTF-8?q?=E3=80=81Dashbaord=20=E9=87=8D=E8=AF=95=E4=BB=BB=E5=8A=A1Bar=20?= =?UTF-8?q?SQL=E4=BC=98=E5=8C=96=E5=88=A0=E9=99=A4=E5=87=BD=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataobject/DashboardCardResponseDO.java | 23 ++----- .../mapper/RetrySummaryMapper.java | 2 +- .../mariadb/mapper/RetrySummaryMapper.xml | 27 ++------ .../mysql/mapper/JobSummaryMapper.xml | 3 +- .../mysql/mapper/RetrySummaryMapper.xml | 62 +++++++------------ .../postgres/mapper/RetrySummaryMapper.xml | 27 ++------ .../response/DashboardCardResponseVO.java | 2 + .../RetrySummaryResponseVOConverter.java | 4 -- .../service/impl/DashBoardServiceImpl.java | 26 +++++++- 9 files changed, 67 insertions(+), 109 deletions(-) diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardCardResponseDO.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardCardResponseDO.java index d71171e2..008cd2bd 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardCardResponseDO.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/dataobject/DashboardCardResponseDO.java @@ -3,7 +3,7 @@ package com.aizuda.easy.retry.template.datasource.persistence.dataobject; import lombok.Data; import java.math.BigDecimal; -import java.util.List; +import java.time.LocalDateTime; /** * @author: wodeyangzipingpingwuqi @@ -22,11 +22,6 @@ public class DashboardCardResponseDO { */ private RetryTask retryTask; - /** - * 重试任务折线图 - */ - private List retryTaskBarList; - @Data public static class RetryTask { @@ -44,6 +39,9 @@ public class DashboardCardResponseDO { // 暂停重试 private Long suspendNum; + + // 触发时间 + private LocalDateTime triggerAt; } @Data @@ -61,17 +59,4 @@ public class DashboardCardResponseDO { // 成功率 private BigDecimal successRate; } - - @Data - public static class RetryTaskBar { - /** - * 时间x轴 - */ - private String x; - - /** - * 任务总数y轴 - */ - private Long taskTotal; - } } diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java index 2c6ca80f..f6278f12 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java @@ -25,7 +25,7 @@ public interface RetrySummaryMapper extends BaseMapper { DashboardCardResponseDO.RetryTask retryTask(@Param("namespaceId") String namespaceId, @Param("groupNames") List groupNames); - List retryTaskBarList(@Param("namespaceId") String namespaceId, @Param("groupNames") List groupNames); + List retryTaskBarList(@Param("namespaceId") String namespaceId, @Param("groupNames") List groupNames); IPage retryTaskList(@Param("namespaceId") String namespaceId, @Param("groupNames") List groupNames, Page page); diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml index e3563a26..fffcd07a 100644 --- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml @@ -57,33 +57,18 @@ - SELECT ifnull(sum(running_num), 0) AS runningNum, - ifnull(sum(finish_num), 0) AS finishNum, - ifnull(sum(max_count_num), 0) AS maxCountNum, - ifnull(sum(suspend_num), 0) AS suspendNum, - ifnull(sum(running_num + finish_num + max_count_num + suspend_num), 0) AS totalNum + SELECT + IFNULL(SUM(running_num), 0) AS runningNum, + IFNULL(SUM(finish_num), 0) AS finishNum, + IFNULL(SUM(max_count_num), 0) AS maxCountNum, + IFNULL(SUM(suspend_num), 0) AS suspendNum, + IFNULL(SUM(running_num + finish_num + max_count_num + suspend_num), 0) AS totalNum FROM retry_summary WHERE namespace_id = #{namespaceId} AND group_name IN - + #{groupName} - SELECT group_name AS groupName, - sum(CASE WHEN (scene_status = 1) THEN 1 ELSE 0 END) AS run, - count(*) AS total + SELECT group_name AS groupName, + SUM(CASE WHEN (scene_status = 1) THEN 1 ELSE 0 END) AS run, + COUNT(*) AS total FROM scene_config WHERE namespace_id = #{namespaceId} AND group_name IN - + #{groupName} diff --git a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/RetrySummaryMapper.xml b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/RetrySummaryMapper.xml index 8e8a9319..d6d33525 100644 --- a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/RetrySummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgres/mapper/RetrySummaryMapper.xml @@ -57,33 +57,18 @@