From a7211b46912bc4aa511ffc4188ed230d4a55887d Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 30 Mar 2024 07:26:59 +0000
Subject: [PATCH] =?UTF-8?q?feat(3.2.0)=20fix:=20JobSummaryMapper.jobLineLi?=
 =?UTF-8?q?st=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2,=E5=87=BD=E6=95=B0=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=95=B0=E6=8D=AE=E5=BA=93=20*=20fix:=20JobS?=
 =?UTF-8?q?ummaryMapper.jobLineList=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E5=AD=97=E7=AC=A6=E4=B8=B2,=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E4=B8=8D=E5=90=8C=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=20*=20feat:=20=E5=AF=B9=E9=BD=903.2.0=20mysql=E7=89=88?=
 =?UTF-8?q?=E6=9C=ACDDL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oracle/mapper/JobSummaryMapper.xml        |  4 +-
 .../postgresql/mapper/JobSummaryMapper.xml    | 31 ++++++-------
 .../sqlserver/mapper/JobSummaryMapper.xml     |  4 +-
 .../common/enums/DashboardLineEnum.java       | 43 ++++++++++++++++---
 .../service/impl/DashBoardServiceImpl.java    |  3 +-
 5 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
index f8b169c7..c6a3c894 100644
--- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
@@ -83,7 +83,7 @@
             COALESCE(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total
         FROM (
             SELECT
-                DATE_FORMAT(trigger_at, #{dateFormat}) AS createDt,
+                TO_CHAR(trigger_at, #{dateFormat}) AS createDt,
                 success_num,
                 fail_num,
                 stop_num,
@@ -91,7 +91,7 @@
             FROM job_summary
             ${ew.customSqlSegment}
         )
-        GROUP BY DATE_FORMAT(trigger_at, #{dateFormat})
+        GROUP BY createDt
     </select>
 
     <select id="toJobTask"
diff --git a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml
index bba3e3c5..adf2fea9 100644
--- a/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml
@@ -53,16 +53,16 @@
     <select id="jobLineList"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardLineResponseDO">
         SELECT
-        DATE_FORMAT(trigger_at, #{dateFormat})                           AS createDt,
-        COALESCE(SUM(success_num), 0)                                    AS success,
-        COALESCE(SUM(fail_num), 0)                                       AS failNum,
-        COALESCE(SUM(stop_num), 0)                                       AS stop,
-        COALESCE(SUM(cancel_num), 0)                                     AS cancel,
-        COALESCE(SUM(fail_num + stop_num + cancel_num), 0)               AS fail,
-        COALESCE(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total
+            TO_CHAR(trigger_at, #{dateFormat})                               AS createDt,
+            COALESCE(SUM(success_num), 0)                                    AS success,
+            COALESCE(SUM(fail_num), 0)                                       AS failNum,
+            COALESCE(SUM(stop_num), 0)                                       AS stop,
+            COALESCE(SUM(cancel_num), 0)                                     AS cancel,
+            COALESCE(SUM(fail_num + stop_num + cancel_num), 0)               AS fail,
+            COALESCE(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total
         FROM job_summary
         ${ew.customSqlSegment}
-        GROUP BY DATE_FORMAT(trigger_at, #{dateFormat})
+        GROUP BY createDt
     </select>
 
     <select id="toJobTask"
@@ -79,13 +79,14 @@
     <select id="dashboardRank"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
         SELECT
-        <if test="systemTaskType == 3">
-            CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = business_id)) name,
-        </if>
-        <if test="systemTaskType == 4">
-            CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name,
-        </if>
-        SUM(fail_num) AS total FROM job_summary
+            <if test="systemTaskType == 3">
+                CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = business_id)) name,
+            </if>
+            <if test="systemTaskType == 4">
+                CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name,
+            </if>
+            SUM(fail_num) AS total
+        FROM job_summary
         ${ew.customSqlSegment}
         HAVING SUM(fail_num) > 0
         ORDER BY total DESC LIMIT 10
diff --git a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
index 2755bdbe..80f1db61 100644
--- a/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
@@ -71,7 +71,7 @@
             ISNULL(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS total
         FROM (
             SELECT
-                DATE_FORMAT(trigger_at, #{dateFormat}) AS createDt,
+                FORMAT(trigger_at, #{dateFormat}) AS createDt,
                 success_num,
                 stop_num,
                 cancel_num,
@@ -79,7 +79,7 @@
             FROM job_summary
             ${ew.customSqlSegment}
         ) AS subquery
-        GROUP BY DATE_FORMAT(trigger_at, #{dateFormat})
+        GROUP BY createDt
     </select>
 
     <select id="toJobTask"
diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/DashboardLineEnum.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/DashboardLineEnum.java
index 70a71d65..16f5bb18 100644
--- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/DashboardLineEnum.java
+++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/DashboardLineEnum.java
@@ -1,5 +1,7 @@
 package com.aizuda.easy.retry.server.common.enums;
 
+import com.aizuda.easy.retry.template.datasource.enums.DbTypeEnum;
+import com.aizuda.easy.retry.template.datasource.utils.DbUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -13,15 +15,13 @@ import lombok.Getter;
 @AllArgsConstructor
 @Getter
 public enum DashboardLineEnum {
-
-    DAY("DAY", "%H"),
-    WEEK("WEEK", "%Y-%m-%d"),
-    MONTH("MONTH", "%Y-%m-%d"),
-    YEAR("YEAR", "%Y-%m"),
+    DAY("DAY"),
+    WEEK("WEEK"),
+    MONTH("MONTH"),
+    YEAR("YEAR"),
     ;
 
     private final String unit;
-    private final String dateFormat;
 
     public static DashboardLineEnum modeOf(String mode) {
         for (DashboardLineEnum value : DashboardLineEnum.values()) {
@@ -32,4 +32,35 @@ public enum DashboardLineEnum {
 
         return DashboardLineEnum.WEEK;
     }
+
+    public static String dateFormat(String unit) {
+        DashboardLineEnum mode = modeOf(unit);
+
+        if (DbUtils.getDbType().equals(DbTypeEnum.MYSQL)) {
+            switch (mode) {
+                case YEAR: return "%Y-%m";
+                case DAY: return "%H";
+                default: return "%Y-%m-%d";
+            }
+        } else if (DbUtils.getDbType().equals(DbTypeEnum.MARIADB)) {
+            switch (mode) {
+                case YEAR: return "%Y-%m";
+                case DAY: return "%H";
+                default: return "%Y-%m-%d";
+            }
+        } else if (DbUtils.getDbType().equals(DbTypeEnum.SQLSERVER)) {
+            switch (mode) {
+                case YEAR: return "yyyy-MM";
+                case DAY: return "HH";
+                default: return "yyyy-MM-dd";
+            }
+        } else { // Oracle, Postgres
+            switch (mode) {
+                case YEAR: return "yyyy-MM";
+                case DAY: return "HH24";
+                default: return "yyyy-MM-dd";
+            }
+        }
+    }
+
 }
diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
index e0605306..0a9bc151 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
@@ -222,7 +222,7 @@ public class DashBoardServiceImpl implements DashBoardService {
                 .eq(JobSummary::getSystemTaskType, systemTaskType)
                 .eq(JobSummary::getNamespaceId, namespaceId)
                 .between(JobSummary::getTriggerAt, startDateTime, endDateTime);
-        List<DashboardLineResponseDO> dashboardLineResponseDOList = jobSummaryMapper.jobLineList(DashboardLineEnum.modeOf(type).getDateFormat(), queryWrapper);
+        List<DashboardLineResponseDO> dashboardLineResponseDOList = jobSummaryMapper.jobLineList(DashboardLineEnum.dateFormat(type), queryWrapper);
         List<DashboardLineResponseVO> dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.toDashboardLineResponseVO(dashboardLineResponseDOList);
         dateTypeEnum.getConsumer().accept(dashboardLineResponseVOList);
         dashboardLineResponseVOList.sort(Comparator.comparing(a -> a.getCreateDt()));
@@ -289,4 +289,5 @@ public class DashBoardServiceImpl implements DashBoardService {
         }
         return new PageResult<>(serverNodePageDTO, serverNodeResponseVOS);
     }
+
 }