修改domain包

internal/domain/notify/notify.go

@@ -1,6 +1,7 @@
 package notify
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"sync"
@@ -10,24 +11,25 @@ import (
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/notify"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
+
 	"go.uber.org/zap"
 )
 
 // Service 定义了通知领域的核心业务逻辑接口
 type Service interface {
 	// SendBatchAlarm 向一批用户发送告警通知。它会并发地为每个用户执行带故障转移的发送逻辑。
-	SendBatchAlarm(userIDs []uint, content notify.AlarmContent) error
+	SendBatchAlarm(ctx context.Context, userIDs []uint, content notify.AlarmContent) error
 
 	// BroadcastAlarm 向所有用户发送告警通知。它会并发地为每个用户执行带故障转移的发送逻辑。
-	BroadcastAlarm(content notify.AlarmContent) error
+	BroadcastAlarm(ctx context.Context, content notify.AlarmContent) error
 
 	// SendTestMessage 向指定用户发送一条测试消息，用于手动验证特定通知渠道的配置。
-	SendTestMessage(userID uint, notifierType notify.NotifierType) error
+	SendTestMessage(ctx context.Context, userID uint, notifierType notify.NotifierType) error
 }
 
 // failoverService 是 Service 接口的实现，提供了故障转移功能
 type failoverService struct {
-	log              *logs.Logger
+	ctx              context.Context
 	userRepo         repository.UserRepository
 	notifiers        map[notify.NotifierType]notify.Notifier
 	primaryNotifier  notify.Notifier
@@ -38,7 +40,7 @@ type failoverService struct {
 
 // NewFailoverService 创建一个新的故障转移通知服务
 func NewFailoverService(
-	log *logs.Logger,
+	ctx context.Context,
 	userRepo repository.UserRepository,
 	notifiers []notify.Notifier,
 	primaryNotifierType notify.NotifierType,
@@ -56,7 +58,7 @@ func NewFailoverService(
 	}
 
 	return &failoverService{
-		log:              log,
+		ctx:              ctx,
 		userRepo:         userRepo,
 		notifiers:        notifierMap,
 		primaryNotifier:  primaryNotifier,
@@ -67,18 +69,19 @@ func NewFailoverService(
 }
 
 // SendBatchAlarm 实现了向多个用户并发发送告警的功能
-func (s *failoverService) SendBatchAlarm(userIDs []uint, content notify.AlarmContent) error {
+func (s *failoverService) SendBatchAlarm(ctx context.Context, userIDs []uint, content notify.AlarmContent) error {
+	serviceCtx, logger := logs.Trace(ctx, s.ctx, "SendBatchAlarm")
 	var wg sync.WaitGroup
 	var mu sync.Mutex
 	var allErrors []string
 
-	s.log.Infow("开始批量发送告警...", "userCount", len(userIDs))
+	logger.Infow("开始批量发送告警...", "userCount", len(userIDs))
 
 	for _, userID := range userIDs {
 		wg.Add(1)
 		go func(id uint) {
 			defer wg.Done()
-			if err := s.sendAlarmToUser(id, content); err != nil {
+			if err := s.sendAlarmToUser(serviceCtx, id, content); err != nil {
 				mu.Lock()
 				allErrors = append(allErrors, fmt.Sprintf("发送失败 (用户ID: %d): %v", id, err))
 				mu.Unlock()
@@ -90,19 +93,20 @@ func (s *failoverService) SendBatchAlarm(userIDs []uint, content notify.AlarmCon
 
 	if len(allErrors) > 0 {
 		finalError := fmt.Errorf("批量告警发送完成，但有 %d 个用户发送失败:\n%s", len(allErrors), strings.Join(allErrors, "\n"))
-		s.log.Error(finalError.Error())
+		logger.Error(finalError.Error())
 		return finalError
 	}
 
-	s.log.Info("批量发送告警成功完成，所有用户均已通知。")
+	logger.Info("批量发送告警成功完成，所有用户均已通知。")
 	return nil
 }
 
 // BroadcastAlarm 实现了向所有用户发送告警的功能
-func (s *failoverService) BroadcastAlarm(content notify.AlarmContent) error {
-	users, err := s.userRepo.FindAll()
+func (s *failoverService) BroadcastAlarm(ctx context.Context, content notify.AlarmContent) error {
+	serviceCtx, logger := logs.Trace(ctx, s.ctx, "BroadcastAlarm")
+	users, err := s.userRepo.FindAll(serviceCtx)
 	if err != nil {
-		s.log.Errorw("广播告警失败：查找所有用户时出错", "error", err)
+		logger.Errorw("广播告警失败：查找所有用户时出错", "error", err)
 		return fmt.Errorf("广播告警失败：查找所有用户时出错: %w", err)
 	}
 
@@ -111,16 +115,17 @@ func (s *failoverService) BroadcastAlarm(content notify.AlarmContent) error {
 		userIDs = append(userIDs, user.ID)
 	}
 
-	s.log.Infow("开始广播告警给所有用户", "totalUsers", len(userIDs))
+	logger.Infow("开始广播告警给所有用户", "totalUsers", len(userIDs))
 	// 复用 SendBatchAlarm 的逻辑进行并发发送和错误处理
-	return s.SendBatchAlarm(userIDs, content)
+	return s.SendBatchAlarm(serviceCtx, userIDs, content)
 }
 
 // sendAlarmToUser 是为单个用户发送告警的内部方法，包含了完整的故障转移逻辑
-func (s *failoverService) sendAlarmToUser(userID uint, content notify.AlarmContent) error {
-	user, err := s.userRepo.FindByID(userID)
+func (s *failoverService) sendAlarmToUser(ctx context.Context, userID uint, content notify.AlarmContent) error {
+	serviceCtx, logger := logs.Trace(ctx, s.ctx, "sendAlarmToUser")
+	user, err := s.userRepo.FindByID(serviceCtx, userID)
 	if err != nil {
-		s.log.Errorw("发送告警失败：查找用户时出错", "userID", userID, "error", err)
+		logger.Errorw("发送告警失败：查找用户时出错", "userID", userID, "error", err)
 		return fmt.Errorf("查找用户失败: %w", err)
 	}
 
@@ -132,50 +137,50 @@ func (s *failoverService) sendAlarmToUser(userID uint, content notify.AlarmConte
 		addr := getAddressForNotifier(primaryType, user.Contact)
 		if addr == "" {
 			// 记录跳过通知
-			s.recordNotificationAttempt(userID, primaryType, content, "", models.NotificationStatusSkipped, fmt.Errorf("用户未配置首选通知方式 '%s' 的地址", primaryType))
+			s.recordNotificationAttempt(serviceCtx, userID, primaryType, content, "", models.NotificationStatusSkipped, fmt.Errorf("用户未配置首选通知方式 '%s' 的地址", primaryType))
 			return fmt.Errorf("用户未配置首选通知方式 '%s' 的地址", primaryType)
 		}
 
-		err = s.primaryNotifier.Send(content, addr)
+		err = s.primaryNotifier.Send(serviceCtx, content, addr)
 		if err == nil {
 			// 记录成功通知
-			s.recordNotificationAttempt(userID, primaryType, content, addr, models.NotificationStatusSuccess, nil)
+			s.recordNotificationAttempt(serviceCtx, userID, primaryType, content, addr, models.NotificationStatusSuccess, nil)
 			if failureCount > 0 {
-				s.log.Infow("首选渠道发送恢复正常", "userID", userID, "notifierType", primaryType)
+				logger.Infow("首选渠道发送恢复正常", "userID", userID, "notifierType", primaryType)
 				s.failureCounters.Store(userID, 0)
 			}
 			return nil
 		}
 
 		// 记录失败通知
-		s.recordNotificationAttempt(userID, primaryType, content, addr, models.NotificationStatusFailed, err)
+		s.recordNotificationAttempt(serviceCtx, userID, primaryType, content, addr, models.NotificationStatusFailed, err)
 		newFailureCount := failureCount + 1
 		s.failureCounters.Store(userID, newFailureCount)
-		s.log.Warnw("首选渠道发送失败", "userID", userID, "notifierType", primaryType, "error", err, "failureCount", newFailureCount)
+		logger.Warnw("首选渠道发送失败", "userID", userID, "notifierType", primaryType, "error", err, "failureCount", newFailureCount)
 		failureCount = newFailureCount
 	}
 
 	if failureCount >= s.failureThreshold {
-		s.log.Warnw("故障转移阈值已达到，开始广播通知", "userID", userID, "threshold", s.failureThreshold)
+		logger.Warnw("故障转移阈值已达到，开始广播通知", "userID", userID, "threshold", s.failureThreshold)
 		var lastErr error
 		for _, notifier := range s.notifiers {
 			addr := getAddressForNotifier(notifier.Type(), user.Contact)
 			if addr == "" {
 				// 记录跳过通知
-				s.recordNotificationAttempt(userID, notifier.Type(), content, "", models.NotificationStatusSkipped, fmt.Errorf("用户未配置通知方式 '%s' 的地址", notifier.Type()))
+				s.recordNotificationAttempt(serviceCtx, userID, notifier.Type(), content, "", models.NotificationStatusSkipped, fmt.Errorf("用户未配置通知方式 '%s' 的地址", notifier.Type()))
 				continue
 			}
-			if err := notifier.Send(content, addr); err == nil {
+			if err := notifier.Send(serviceCtx, content, addr); err == nil {
 				// 记录成功通知
-				s.recordNotificationAttempt(userID, notifier.Type(), content, addr, models.NotificationStatusSuccess, nil)
-				s.log.Infow("广播通知成功", "userID", userID, "notifierType", notifier.Type())
+				s.recordNotificationAttempt(serviceCtx, userID, notifier.Type(), content, addr, models.NotificationStatusSuccess, nil)
+				logger.Infow("广播通知成功", "userID", userID, "notifierType", notifier.Type())
 				s.failureCounters.Store(userID, 0)
 				return nil
 			}
 			// 记录失败通知
-			s.recordNotificationAttempt(userID, notifier.Type(), content, addr, models.NotificationStatusFailed, err)
+			s.recordNotificationAttempt(serviceCtx, userID, notifier.Type(), content, addr, models.NotificationStatusFailed, err)
 			lastErr = err
-			s.log.Warnw("广播通知：渠道发送失败", "userID", userID, "notifierType", notifier.Type(), "error", err)
+			logger.Warnw("广播通知：渠道发送失败", "userID", userID, "notifierType", notifier.Type(), "error", err)
 		}
 		return fmt.Errorf("所有渠道均发送失败，最后一个错误: %w", lastErr)
 	}
@@ -184,24 +189,25 @@ func (s *failoverService) sendAlarmToUser(userID uint, content notify.AlarmConte
 }
 
 // SendTestMessage 实现了手动发送测试消息的功能
-func (s *failoverService) SendTestMessage(userID uint, notifierType notify.NotifierType) error {
-	user, err := s.userRepo.FindByID(userID)
+func (s *failoverService) SendTestMessage(ctx context.Context, userID uint, notifierType notify.NotifierType) error {
+	serviceCtx, logger := logs.Trace(ctx, s.ctx, "SendTestMessage")
+	user, err := s.userRepo.FindByID(serviceCtx, userID)
 	if err != nil {
-		s.log.Errorw("发送测试消息失败：查找用户时出错", "userID", userID, "error", err)
+		logger.Errorw("发送测试消息失败：查找用户时出错", "userID", userID, "error", err)
 		return fmt.Errorf("查找用户失败: %w", err)
 	}
 
 	notifier, ok := s.notifiers[notifierType]
 	if !ok {
-		s.log.Errorw("发送测试消息失败：通知器类型不存在", "userID", userID, "notifierType", notifierType)
+		logger.Errorw("发送测试消息失败：通知器类型不存在", "userID", userID, "notifierType", notifierType)
 		return fmt.Errorf("指定的通知器类型 '%s' 不存在", notifierType)
 	}
 
 	addr := getAddressForNotifier(notifierType, user.Contact)
 	if addr == "" {
-		s.log.Warnw("发送测试消息失败：缺少地址", "userID", userID, "notifierType", notifierType)
+		logger.Warnw("发送测试消息失败：缺少地址", "userID", userID, "notifierType", notifierType)
 		// 记录跳过通知
-		s.recordNotificationAttempt(userID, notifierType, notify.AlarmContent{
+		s.recordNotificationAttempt(serviceCtx, userID, notifierType, notify.AlarmContent{
 			Title:     "通知服务测试",
 			Message:   fmt.Sprintf("这是一条来自【%s】渠道的测试消息。如果您收到此消息，说明您的配置正确。", notifierType),
 			Level:     zap.InfoLevel,
@@ -217,18 +223,18 @@ func (s *failoverService) SendTestMessage(userID uint, notifierType notify.Notif
 		Timestamp: time.Now(),
 	}
 
-	s.log.Infow("正在发送测试消息...", "userID", userID, "notifierType", notifierType, "address", addr)
-	err = notifier.Send(testContent, addr)
+	logger.Infow("正在发送测试消息...", "userID", userID, "notifierType", notifierType, "address", addr)
+	err = notifier.Send(serviceCtx, testContent, addr)
 	if err != nil {
-		s.log.Errorw("发送测试消息失败", "userID", userID, "notifierType", notifierType, "error", err)
+		logger.Errorw("发送测试消息失败", "userID", userID, "notifierType", notifierType, "error", err)
 		// 记录失败通知
-		s.recordNotificationAttempt(userID, notifierType, testContent, addr, models.NotificationStatusFailed, err)
+		s.recordNotificationAttempt(serviceCtx, userID, notifierType, testContent, addr, models.NotificationStatusFailed, err)
 		return err
 	}
 
-	s.log.Infow("发送测试消息成功", "userID", userID, "notifierType", notifierType)
+	logger.Infow("发送测试消息成功", "userID", userID, "notifierType", notifierType)
 	// 记录成功通知
-	s.recordNotificationAttempt(userID, notifierType, testContent, addr, models.NotificationStatusSuccess, nil)
+	s.recordNotificationAttempt(serviceCtx, userID, notifierType, testContent, addr, models.NotificationStatusSuccess, nil)
 	return nil
 }
 
@@ -256,6 +262,7 @@ func getAddressForNotifier(notifierType notify.NotifierType, contact models.Cont
 // status: 发送尝试的状态 (成功、失败、跳过)
 // err: 如果发送失败，记录的错误信息
 func (s *failoverService) recordNotificationAttempt(
+	ctx context.Context,
 	userID uint,
 	notifierType notify.NotifierType,
 	content notify.AlarmContent,
@@ -263,6 +270,7 @@ func (s *failoverService) recordNotificationAttempt(
 	status models.NotificationStatus,
 	err error,
 ) {
+	serviceCtx, logger := logs.Trace(ctx, s.ctx, "recordNotificationAttempt")
 	errorMessage := ""
 	if err != nil {
 		errorMessage = err.Error()
@@ -280,8 +288,8 @@ func (s *failoverService) recordNotificationAttempt(
 		ErrorMessage:   errorMessage,
 	}
 
-	if saveErr := s.notificationRepo.Create(notification); saveErr != nil {
-		s.log.Errorw("无法保存通知发送记录到数据库",
+	if saveErr := s.notificationRepo.Create(serviceCtx, notification); saveErr != nil {
+		logger.Errorw("无法保存通知发送记录到数据库",
 			"userID", userID,
 			"notifierType", notifierType,
 			"status", status,