From 5b985a0231fb9fffefae3547d9831cf70ec66c63 Mon Sep 17 00:00:00 2001
From: zhengweilin <zhengweilin@bw8848.com>
Date: Tue, 5 Dec 2023 18:16:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=202.5.0:=201=E3=80=81=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E3=80=81=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E=E6=88=96?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=B9=E4=B8=BA=E6=99=AE=E9=80=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=88=96=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/mapper/JobSummaryMapper.java  |  4 +-
 .../mapper/RetrySummaryMapper.java            |  4 +-
 .../mysql/mapper/JobSummaryMapper.xml         | 36 +---------
 .../mysql/mapper/RetrySummaryMapper.xml       | 68 ++++++-------------
 .../support/schedule/JobSummarySchedule.java  |  7 +-
 .../schedule/RetrySummarySchedule.java        |  7 +-
 frontend/src/views/dashboard/JobAnalysis.vue  |  2 +-
 .../src/views/dashboard/RetryAnalysis.vue     |  2 +-
 8 files changed, 31 insertions(+), 99 deletions(-)

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 3608d072..4a271b21 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
@@ -21,9 +21,7 @@ import java.util.List;
 @Mapper
 public interface JobSummaryMapper extends BaseMapper<JobSummary> {
 
-    int insertBatchJobSummary(@Param("list") List<JobSummary> list);
-
-    int updateBatchTriggerAtById(@Param("list") List<JobSummary> list);
+    int insertOrUpdate(@Param("list") List<JobSummary> list);
 
     IPage<DashboardRetryLineResponseDO.Task> jobTaskList(@Param("namespaceId") String namespaceId, Page<Object> page);
 
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 8dc259e3..c609070b 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
@@ -21,9 +21,7 @@ import java.util.List;
 @Mapper
 public interface RetrySummaryMapper extends BaseMapper<RetrySummary> {
 
-    int insertBatchRetrySummary(@Param("list") List<RetrySummary> list);
-
-    int updateBatchSceneNameById(@Param("list") List<RetrySummary> list);
+    int insertOrUpdate(@Param("list") List<RetrySummary> list);
 
     DashboardCardResponseDO.RetryTask retryTask(@Param("namespaceId") String namespaceId);
 
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 6c1e8071..18eec6cf 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
@@ -18,7 +18,7 @@
         <result column="update_dt" jdbcType="TIMESTAMP" property="updateDt"/>
     </resultMap>
 
-    <insert id="insertBatchJobSummary">
+    <insert id="insertOrUpdate" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO
         job_summary (namespace_id, group_name, job_id, trigger_at,
         success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason)
@@ -38,40 +38,10 @@
             #{item.cancelReason}
             )
         </foreach>
+        ON DUPLICATE KEY UPDATE
+        job_id = values(`job_id`), trigger_at = values(`trigger_at`)
     </insert>
 
-    <update id="updateBatchTriggerAtById" parameterType="java.util.List">
-        UPDATE job_summary js,
-        (
-        <foreach collection="list" item="item" index="index" separator=" union all ">
-            SELECT
-            #{item.namespaceId} AS namespace_id,
-            #{item.groupName} AS group_name,
-            #{item.jobId} AS job_id,
-            #{item.triggerAt} AS trigger_at,
-            #{item.successNum} AS success_num,
-            #{item.failNum} AS fail_num,
-            #{item.failReason} AS fail_reason,
-            #{item.stopNum} AS stop_num,
-            #{item.stopReason} AS stop_reason,
-            #{item.cancelNum} AS cancel_num,
-            #{item.cancelReason} AS cancel_reason
-        </foreach>
-        ) tt
-        SET
-        js.namespace_id = tt.namespace_id,
-        js.group_name = tt.group_name,
-        js.job_id = tt.job_id,
-        js.success_num = tt.success_num,
-        js.fail_num = tt.fail_num,
-        js.fail_reason = tt.fail_reason,
-        js.stop_num = tt.stop_num,
-        js.stop_reason = tt.stop_reason,
-        js.cancel_num = tt.cancel_num,
-        js.cancel_reason = tt.cancel_reason
-        WHERE js.job_id = tt.job_id AND js.trigger_at = tt.trigger_at
-    </update>
-
     <select id="jobLineList"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardLineResponseDO">
         SELECT
diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml
index 4201a9f4..6d0bc467 100644
--- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml
@@ -15,7 +15,7 @@
         <result column="update_dt" jdbcType="TIMESTAMP" property="updateDt"/>
     </resultMap>
 
-    <insert id="insertBatchRetrySummary">
+    <insert id="insertOrUpdate" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO
         retry_summary (namespace_id, group_name, scene_name, trigger_at, running_num, finish_num, max_count_num,
         suspend_num)
@@ -32,38 +32,13 @@
             #{item.suspendNum}
             )
         </foreach>
+        ON DUPLICATE KEY UPDATE
+        namespace_id = values(`namespace_id`),
+        group_name = values(`group_name`),
+        scene_name = values(`scene_name`),
+        trigger_at = values(`trigger_at`)
     </insert>
 
-    <update id="updateBatchSceneNameById" parameterType="java.util.List">
-        UPDATE retry_summary rs,
-        (
-        <foreach collection="list" item="item" index="index" separator=" union all ">
-            SELECT
-            #{item.namespaceId} AS namespace_id,
-            #{item.groupName} AS group_name,
-            #{item.sceneName} AS scene_name,
-            #{item.triggerAt} AS trigger_at,
-            #{item.runningNum} AS running_num,
-            #{item.finishNum} AS finish_num,
-            #{item.maxCountNum} AS max_count_num,
-            #{item.suspendNum} AS suspend_num
-        </foreach>
-        ) tt
-        SET
-        rs.namespace_id = tt.namespace_id,
-        rs.group_name = tt.group_name,
-        rs.scene_name = tt.scene_name,
-        rs.running_num = tt.running_num,
-        rs.finish_num = tt.finish_num,
-        rs.max_count_num = tt.max_count_num,
-        rs.suspend_num = tt.suspend_num
-        WHERE
-        rs.namespace_id = tt.namespace_id
-        AND rs.group_name = tt.group_name
-        AND rs.scene_name = tt.scene_name
-        AND rs.trigger_at = tt.trigger_at
-    </update>
-
     <select id="retryTask"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
         SELECT ifnull(sum(running_num), 0)                                            AS runningNum,
@@ -78,23 +53,20 @@
     <select id="retryTaskBarList"
             resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTaskBar">
         SELECT tmp.date AS x, ifnull(b.taskTotal, 0) AS taskTotal
-        FROM (
-                 SELECT curdate() AS date
-                 UNION ALL
-                 SELECT DATE_SUB(CURDATE(), INTERVAL 1 DAY) AS date
-                 UNION ALL
-                 SELECT DATE_SUB(CURDATE(), interval 2 day) AS date
-                 UNION ALL
-                 SELECT DATE_SUB(CURDATE(), interval 3 day) AS date
-                 UNION ALL
-                 SELECT DATE_SUB(CURDATE(), interval 4 day) AS date
-                 UNION ALL
-                 SELECT DATE_SUB(CURDATE(), interval 5 day) AS date
-                 UNION ALL
-                 SELECT DATE_SUB(CURDATE(), interval 6 day) AS date
-             ) tmp
-                 LEFT JOIN (
-            SELECT DATE (trigger_at) AS triggerAt,
+        FROM (SELECT curdate() AS date
+              UNION ALL
+              SELECT DATE_SUB(CURDATE(), INTERVAL 1 DAY) AS date
+              UNION ALL
+              SELECT DATE_SUB(CURDATE(), interval 2 day) AS date
+              UNION ALL
+              SELECT DATE_SUB(CURDATE(), interval 3 day) AS date
+              UNION ALL
+              SELECT DATE_SUB(CURDATE(), interval 4 day) AS date
+              UNION ALL
+              SELECT DATE_SUB(CURDATE(), interval 5 day) AS date
+              UNION ALL
+              SELECT DATE_SUB(CURDATE(), interval 6 day) AS date) tmp
+                 LEFT JOIN (SELECT DATE (trigger_at) AS triggerAt,
              SUM(running_num + finish_num + max_count_num + suspend_num) AS taskTotal FROM retry_summary
         WHERE namespace_id = #{namespaceId}
         GROUP BY triggerAt
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 b43f70d8..d3c3014b 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
@@ -69,11 +69,8 @@ public class JobSummarySchedule extends AbstractSchedule implements Lifecycle {
 
                 // insertOrUpdate
                 List<JobSummary> jobSummaryList = jobSummaryList(todayFrom, summaryResponseDOList);
-                int total = jobSummaryMapper.updateBatchTriggerAtById(jobSummaryList);
-                if (total < 1) {
-                    jobSummaryMapper.insertBatchJobSummary(jobSummaryList);
-                }
-                LogUtils.debug(log, "job summary dashboard success todayFrom:[{}] todayTo:[{}] total:[{}]", todayFrom, todayTo, total);
+                int totalJobSummary = jobSummaryMapper.insertOrUpdate(jobSummaryList);
+                LogUtils.debug(log, "job summary dashboard success todayFrom:[{}] todayTo:[{}] total:[{}]", todayFrom, todayTo, totalJobSummary);
             }
         } catch (Exception e) {
             LogUtils.error(log, "job summary dashboard log error", e);
diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/schedule/RetrySummarySchedule.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/schedule/RetrySummarySchedule.java
index c28e3145..a9fe2c02 100644
--- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/schedule/RetrySummarySchedule.java
+++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/schedule/RetrySummarySchedule.java
@@ -67,11 +67,8 @@ public class RetrySummarySchedule extends AbstractSchedule implements Lifecycle
 
                 // insertOrUpdate
                 List<RetrySummary> retrySummaryList = retrySummaryList(todayFrom, dashboardRetryResponseDOList);
-                int total = retrySummaryMapper.updateBatchSceneNameById(retrySummaryList);
-                if (total < 1) {
-                    retrySummaryMapper.insertBatchRetrySummary(retrySummaryList);
-                }
-                LogUtils.debug(log, "retry summary dashboard success todayFrom:[{}] todayTo:[{}] total:[{}]", todayFrom, todayTo, total);
+                int totalRetrySummary = retrySummaryMapper.insertOrUpdate(retrySummaryList);
+                LogUtils.debug(log, "retry summary dashboard success todayFrom:[{}] todayTo:[{}] total:[{}]", todayFrom, todayTo, totalRetrySummary);
             }
         } catch (Exception e) {
             LogUtils.error(log, "retry summary dashboard log error", e);
diff --git a/frontend/src/views/dashboard/JobAnalysis.vue b/frontend/src/views/dashboard/JobAnalysis.vue
index 0488b6c2..fa1ba72a 100644
--- a/frontend/src/views/dashboard/JobAnalysis.vue
+++ b/frontend/src/views/dashboard/JobAnalysis.vue
@@ -28,7 +28,7 @@
           <div>
             <div>
               <v-chart :force-fit="true" :height="405" :data="pieData" :scale="pieScale" >
-                <v-tooltip :showTitle="true" dataKey="value*percent" />
+                <v-tooltip :showTitle="false" dataKey="value*percent" />
                 <v-axis />
                 <v-legend dataKey="value" />
                 <v-pie position="percent" color="value" :vStyle="pieStyle" />
diff --git a/frontend/src/views/dashboard/RetryAnalysis.vue b/frontend/src/views/dashboard/RetryAnalysis.vue
index 9aeff74d..8e3cdb78 100644
--- a/frontend/src/views/dashboard/RetryAnalysis.vue
+++ b/frontend/src/views/dashboard/RetryAnalysis.vue
@@ -28,7 +28,7 @@
           <div>
             <div>
               <v-chart :force-fit="true" :height="405" :data="pieData" :scale="pieScale" >
-                <v-tooltip :showTitle="false" dataKey="name*percent" />
+                <v-tooltip :showTitle="false" dataKey="value*percent" />
                 <v-axis />
                 <v-legend dataKey="value" />
                 <v-pie position="percent" color="value" :vStyle="pieStyle" />