合并websocket逻辑

internal/service/heartbeat.go

@@ -12,13 +12,14 @@ import (
 	"git.huangwc.com/pig/pig-farm-controller/internal/logs"
 	"git.huangwc.com/pig/pig-farm-controller/internal/model"
 	"git.huangwc.com/pig/pig-farm-controller/internal/storage/repository"
+	"git.huangwc.com/pig/pig-farm-controller/internal/websocket"
 	"github.com/panjf2000/ants/v2"
 )
 
 // HeartbeatService 心跳服务，负责管理设备的心跳检测
 type HeartbeatService struct {
-	// websocketService WebSocket服务
-	websocketService *WebSocketService
+	// websocketManager WebSocket管理器
+	websocketManager *websocket.Manager
 
 	// deviceStatusPool 设备状态池
 	deviceStatusPool *DeviceStatusPool
@@ -52,7 +53,7 @@ type HeartbeatService struct {
 }
 
 // NewHeartbeatService 创建心跳服务实例
-func NewHeartbeatService(websocketService *WebSocketService, deviceStatusPool *DeviceStatusPool, deviceRepo repository.DeviceRepo, config *config.Config) *HeartbeatService {
+func NewHeartbeatService(websocketManager *websocket.Manager, deviceStatusPool *DeviceStatusPool, deviceRepo repository.DeviceRepo, config *config.Config) *HeartbeatService {
 
 	interval := config.GetHeartbeatConfig().Interval
 	if interval <= 0 {
@@ -65,7 +66,7 @@ func NewHeartbeatService(websocketService *WebSocketService, deviceStatusPool *D
 	}
 
 	return &HeartbeatService{
-		websocketService:  websocketService,
+		websocketManager:  websocketManager,
 		deviceStatusPool:  deviceStatusPool,
 		deviceRepo:        deviceRepo,
 		logger:            logs.NewLogger(),
@@ -241,7 +242,7 @@ func (hs *HeartbeatService) handleHeartbeatWithStatus(deviceID string, tempStatu
 	}
 
 	// 发送心跳包到设备
-	response, err := hs.websocketService.SendCommandAndWait(deviceID, "heartbeat", heartbeatData, 0)
+	response, err := hs.websocketManager.SendCommandAndWait(deviceID, "heartbeat", heartbeatData, 0)
 	if err != nil {
 		hs.logger.Error(fmt.Sprintf("向设备 %s 发送心跳包失败: %v", deviceID, err))
 		// 更新设备状态为离线