From 3a6566c532fc7ccc19d686071feb56d396be4d84 Mon Sep 17 00:00:00 2001
From: xiaochaihu <2521303550@qq.com>
Date: Fri, 21 Feb 2025 00:43:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=97=A0=E6=B3=95=E7=BB=9F=E8=AE=A1=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/persistence/mapper/RetryMapper.java       | 4 ++++
 .../mapper/{RetryTaskLogMapper.xml => RetryMapper.xml}   | 6 +++---
 .../task/support/schedule/RetrySummarySchedule.java      | 9 ++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/{RetryTaskLogMapper.xml => RetryMapper.xml} (91%)

diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryMapper.java
index 93c51f636..a30eb7065 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryMapper.java
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryMapper.java
@@ -1,6 +1,9 @@
 package com.aizuda.snailjob.template.datasource.persistence.mapper;
 
+import com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO;
 import com.aizuda.snailjob.template.datasource.persistence.po.Retry;
+import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,4 +15,5 @@ public interface RetryMapper extends BaseMapper<Retry> {
 
     int updateBatchNextTriggerAtById(@Param("list") List<Retry> list);
 
+    List<DashboardRetryResponseDO> selectRetrySummaryList(@Param("ew") Wrapper<RetryTask> wrapper);
 }
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryMapper.xml
similarity index 91%
rename from snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml
rename to snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryMapper.xml
index dd8920ab9..9fb1310d3 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper">
+<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper">
 
-    <select id="selectRetryRetryTaskLogSummaryList"
+    <select id="selectRetrySummaryList"
             resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO">
         SELECT namespace_id                                          AS namespaceId,
                group_name                                            AS groupName,
@@ -11,7 +11,7 @@
                SUM(CASE WHEN (retry_status = 1) THEN 1 ELSE 0 END)   AS finishNum,
                SUM(CASE WHEN (retry_status = 2) THEN 1 ELSE 0 END)   AS maxCountNum,
                SUM(CASE WHEN (retry_status = 3) THEN 1 ELSE 0 END)   AS suspendNum
-        FROM sj_retry_task a
+        FROM sj_retry a
                  join (SELECT namespace_id AS namespaceId, group_name AS groupName, scene_name AS sceneName
                        FROM sj_retry_scene_config) b
                      on a.namespace_id = b.namespaceId and a.group_name = b.groupName and a.scene_name = b.sceneName
diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetrySummarySchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetrySummarySchedule.java
index 760bd8dda..249696bfe 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetrySummarySchedule.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetrySummarySchedule.java
@@ -8,8 +8,8 @@ import com.aizuda.snailjob.server.common.config.SystemProperties;
 import com.aizuda.snailjob.server.common.schedule.AbstractSchedule;
 import com.aizuda.snailjob.server.common.triple.Triple;
 import com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO;
+import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper;
 import com.aizuda.snailjob.template.datasource.persistence.mapper.RetrySummaryMapper;
-import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper;
 import com.aizuda.snailjob.template.datasource.persistence.po.RetrySummary;
 import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -34,7 +34,7 @@ import java.util.*;
 @Component
 @RequiredArgsConstructor
 public class RetrySummarySchedule extends AbstractSchedule implements Lifecycle {
-    private final RetryTaskMapper retryTaskMapper;
+    private final RetryMapper retryMapper;
     private final RetrySummaryMapper retrySummaryMapper;
     private final SystemProperties systemProperties;
 
@@ -64,7 +64,7 @@ public class RetrySummarySchedule extends AbstractSchedule implements Lifecycle
                 LambdaQueryWrapper<RetryTask> wrapper = new LambdaQueryWrapper<RetryTask>()
                         .between(RetryTask::getCreateDt, todayFrom, todayTo)
                         .groupBy(RetryTask::getNamespaceId, RetryTask::getGroupName, RetryTask::getSceneName);
-                List<DashboardRetryResponseDO> dashboardRetryResponseDOList = retryTaskMapper.selectRetryRetryTaskLogSummaryList(wrapper);
+                List<DashboardRetryResponseDO> dashboardRetryResponseDOList = retryMapper.selectRetrySummaryList(wrapper);
                 if (CollUtil.isEmpty(dashboardRetryResponseDOList)) {
                     continue;
                 }
@@ -142,8 +142,7 @@ public class RetrySummarySchedule extends AbstractSchedule implements Lifecycle
 
     @Override
     public void start() {
-        // todo 待处理
-//        taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1M"));
+        taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1M"));
     }
 
     @Override