From 69ef41cbaf37f46467ad7130c1b4427edacad151 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Sat, 14 Jan 2023 20:47:58 +0800
Subject: [PATCH] =?UTF-8?q?0.0.3.0=20=E4=BC=98=E5=8C=96=E9=87=8D=E8=AF=95?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/mybatis/mapper/RetryTaskMapper.java       | 3 ++-
 .../support/schedule/AlarmNotifyThreadSchedule.java       | 3 ++-
 .../src/main/resources/mapper/RetryTaskMapper.xml         | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java b/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java
index 09cad77c8..ecf4e52c7 100644
--- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java
+++ b/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java
@@ -12,6 +12,7 @@ public interface RetryTaskMapper extends BaseMapper<RetryTask> {
 
     int deleteBatch(@Param("ids") List<Long> ids, @Param("partition") Integer partition);
 
-    int countAllRetryTask(@Param("partition") Integer partition);
+    int countAllRetryTaskByRetryStatus(@Param("partition") Integer partition,
+                                       @Param("retryStatus") Integer retryStatus);
 
 }
diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/schedule/AlarmNotifyThreadSchedule.java b/x-retry-server/src/main/java/com/x/retry/server/support/schedule/AlarmNotifyThreadSchedule.java
index c69b3640e..adef7ca53 100644
--- a/x-retry-server/src/main/java/com/x/retry/server/support/schedule/AlarmNotifyThreadSchedule.java
+++ b/x-retry-server/src/main/java/com/x/retry/server/support/schedule/AlarmNotifyThreadSchedule.java
@@ -4,6 +4,7 @@ import com.x.retry.common.core.alarm.Alarm;
 import com.x.retry.common.core.alarm.AlarmContext;
 import com.x.retry.common.core.alarm.AltinAlarmFactory;
 import com.x.retry.common.core.enums.NotifySceneEnum;
+import com.x.retry.common.core.enums.RetryStatusEnum;
 import com.x.retry.common.core.log.LogUtils;
 import com.x.retry.common.core.util.EnvironmentUtils;
 import com.x.retry.common.core.util.HostUtils;
@@ -69,7 +70,7 @@ public class AlarmNotifyThreadSchedule {
                 continue;
             }
 
-            int count = retryTaskMapper.countAllRetryTask(groupConfig.getGroupPartition());
+            int count = retryTaskMapper.countAllRetryTaskByRetryStatus(groupConfig.getGroupPartition(), RetryStatusEnum.RUNNING.getLevel());
             if (count > notifyConfig.getNotifyThreshold()) {
                 // 预警
                 AlarmContext context = AlarmContext.build()
diff --git a/x-retry-server/src/main/resources/mapper/RetryTaskMapper.xml b/x-retry-server/src/main/resources/mapper/RetryTaskMapper.xml
index 034541622..305046777 100644
--- a/x-retry-server/src/main/resources/mapper/RetryTaskMapper.xml
+++ b/x-retry-server/src/main/resources/mapper/RetryTaskMapper.xml
@@ -21,7 +21,7 @@
     create_dt, update_dt
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from retry_task_${partition}
     where id = #{id,jdbcType=BIGINT}
@@ -51,10 +51,10 @@
     <include refid="Base_Column_List" />
     from retry_task_${partition} where retry_status = #{retryStatus,jdbcType=TINYINT} limit 1000
   </select>
-  <select id="countAllRetryTask" resultType="int">
+  <select id="countAllRetryTaskByRetryStatus" resultType="int">
     select
     count(*)
-    from retry_task_${partition}
+    from retry_task_${partition} where retry_status = #{retryStatus}
   </select>
   <select id="selectRetryTaskByGroupIdAndSceneId" resultMap="BaseResultMap">
     select
@@ -66,4 +66,4 @@
     <include refid="Base_Column_List" />
     from retry_task_${partition}
   </select>
-</mapper>
\ No newline at end of file
+</mapper>