fix filter fingerprint logic in eval.recover

Author: Cairry

alert/eval/eval.go

@@ -223,6 +223,15 @@ func (t *AlertRule) getEvalTimeDuration(evalTimeType string, evalInterval int64)
 }
 
 func (t *AlertRule) Recover(tenantId, ruleId string, eventCacheKey models.AlertEventCacheKey, faultCenterInfoKey models.FaultCenterInfoCacheKey, curFingerprints []string) {
+	// 过滤空指纹
+	var filteredCurFingerprints []string
+	for _, fp := range curFingerprints {
+		if fp != "" {
+			filteredCurFingerprints = append(filteredCurFingerprints, fp)
+		}
+	}
+	curFingerprints = filteredCurFingerprints
+
 	// 校验 key 非空
 	if eventCacheKey == "" || faultCenterInfoKey == "" {
 		logc.Errorf(t.ctx.Ctx, "AlertRule.Recover: eventCacheKey or faultCenterInfoKey is empty")
@@ -258,15 +267,6 @@ func (t *AlertRule) Recover(tenantId, ruleId string, eventCacheKey models.AlertE
 		activeRuleFingerprints = append(activeRuleFingerprints, fingerprint)
 	}
 
-	// 过滤空指纹
-	filteredCurFingerprints := make([]string, 0, len(curFingerprints))
-	for _, fp := range curFingerprints {
-		if fp == "" {
-			filteredCurFingerprints = append(filteredCurFingerprints, fp)
-		}
-	}
-	curFingerprints = filteredCurFingerprints
-
 	/*
 		从待恢复状态转换成告警状态（即在 Redis 中存在待恢复 且在 curFingerprints 存在告警的事件）
 	*/
@@ -313,13 +313,13 @@ func (t *AlertRule) Recover(tenantId, ruleId string, eventCacheKey models.AlertE
 		// 获取待恢复状态的时间戳
 		wTime, err := t.ctx.Redis.PendingRecover().Get(tenantId, ruleId, fingerprint)
 		if err == redis.Nil {
-			// 进入待恢复状态, 如果不存在, 则记录当前时间
-			t.ctx.Redis.PendingRecover().Set(tenantId, ruleId, fingerprint, curTime)
 			// 转换状态, 标记为待恢复
 			if err := newEvent.TransitionStatus(models.StatePendingRecovery); err != nil {
 				logc.Errorf(t.ctx.Ctx, "Failed to transition to「pending_recovery」state for fingerprint %s: %v", fingerprint, err)
 				continue
 			}
+			// 记录当前时间
+			t.ctx.Redis.PendingRecover().Set(tenantId, ruleId, fingerprint, curTime)
 			t.ctx.Redis.Alert().PushAlertEvent(newEvent)
 			continue
 		} else if err != nil {