拆分device.Service接口

internal/domain/device/device_service.go

@@ -42,17 +42,21 @@ func WithoutTracking() SendOption {
 	}
 }
 
-// Service 抽象了一组方法用于控制设备行为
-type Service interface {
-
-	// Switch 用于切换指定设备的状态, 比如启动和停止
+// DeviceOperator 提供了对单个或多个设备进行具体操作的接口，
+// 如开关、触发采集等。它通常用于响应用户的直接指令或执行具体的业务任务。
+type DeviceOperator interface {
+	// Switch 用于切换指定设备的状态, 比如启动和停止。
 	Switch(ctx context.Context, device *models.Device, action DeviceAction) error
 
 	// Collect 用于发起对指定区域主控下的多个设备的批量采集请求。
 	Collect(ctx context.Context, areaControllerID uint32, devicesToCollect []*models.Device) error
+}
 
-	// Send 是一个通用的发送方法，用于将一个标准的指令载荷发送到指定的区域主控。
-	// 它负责将载荷包装成顶层指令、序列化、调用底层发送器，并默认记录下行命令日志。
+// DeviceCommunicator 抽象了与设备进行底层通信的能力。
+// 它负责将一个标准的指令载荷发送到指定的区域主控。
+type DeviceCommunicator interface {
+	// Send 是一个通用的发送方法，它负责将载荷包装、序列化、
+	// 调用底层发送器，并默认记录下行命令日志。
 	Send(ctx context.Context, areaControllerID uint32, payload proto.InstructionPayload, opts ...SendOption) error
 }
 

internal/domain/device/general_device_service.go

@@ -34,7 +34,7 @@ func NewGeneralDeviceService(
 	deviceCommandLogRepo repository.DeviceCommandLogRepository,
 	pendingCollectionRepo repository.PendingCollectionRepository,
 	comm transport.Communicator,
-) Service {
+) *GeneralDeviceService {
 	return &GeneralDeviceService{
 		ctx:                   ctx,
 		deviceRepo:            deviceRepo,

internal/domain/plan/plan_execution_manager.go

@@ -6,7 +6,6 @@ import (
 	"sync"
 	"time"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/domain/device"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
@@ -95,7 +94,6 @@ type planExecutionManagerImpl struct {
 	taskFactory             TaskFactory
 	analysisPlanTaskManager AnalysisPlanTaskManager
 	progressTracker         *ProgressTracker
-	deviceService           device.Service
 
 	pool     *ants.Pool // 使用 ants 协程池来管理并发
 	wg       sync.WaitGroup
@@ -112,7 +110,6 @@ func NewPlanExecutionManager(
 	planRepo repository.PlanRepository,
 	analysisPlanTaskManager AnalysisPlanTaskManager,
 	taskFactory TaskFactory,
-	deviceService device.Service,
 	interval time.Duration,
 	numWorkers int,
 ) ExecutionManager {
@@ -125,7 +122,6 @@ func NewPlanExecutionManager(
 		planRepo:                planRepo,
 		analysisPlanTaskManager: analysisPlanTaskManager,
 		taskFactory:             taskFactory,
-		deviceService:           deviceService,
 		pollingInterval:         interval,
 		workers:                 numWorkers,
 		progressTracker:         NewProgressTracker(),

internal/domain/task/full_collection_task.go

@@ -16,7 +16,7 @@ type FullCollectionTask struct {
 	ctx           context.Context
 	log           *models.TaskExecutionLog
 	deviceRepo    repository.DeviceRepository
-	deviceService device.Service
+	deviceService device.DeviceOperator
 }
 
 // NewFullCollectionTask 创建一个全量采集任务实例
@@ -24,7 +24,7 @@ func NewFullCollectionTask(
 	ctx context.Context,
 	log *models.TaskExecutionLog,
 	deviceRepo repository.DeviceRepository,
-	deviceService device.Service,
+	deviceService device.DeviceOperator,
 ) plan.Task {
 	return &FullCollectionTask{
 		ctx:           ctx,

internal/domain/task/heartbeat_task.go

@@ -17,7 +17,7 @@ type HeartbeatTask struct {
 	ctx                context.Context
 	log                *models.TaskExecutionLog
 	areaControllerRepo repository.AreaControllerRepository
-	deviceService      device.Service
+	deviceService      device.DeviceCommunicator
 }
 
 // NewHeartbeatTask 创建一个心跳检测任务实例
@@ -25,7 +25,7 @@ func NewHeartbeatTask(
 	ctx context.Context,
 	log *models.TaskExecutionLog,
 	areaControllerRepo repository.AreaControllerRepository,
-	deviceService device.Service,
+	deviceService device.DeviceCommunicator,
 ) plan.Task {
 	return &HeartbeatTask{
 		ctx:                ctx,

internal/domain/task/release_feed_weight_task.go

@@ -32,7 +32,7 @@ type ReleaseFeedWeightTask struct {
 	releaseWeight      float32
 	mixingTankDeviceID uint32
 
-	feedPort device.Service
+	feedPort device.DeviceOperator
 
 	// onceParse 保证解析参数只执行一次
 	onceParse sync.Once
@@ -44,7 +44,7 @@ func NewReleaseFeedWeightTask(
 	claimedLog *models.TaskExecutionLog,
 	sensorDataRepo repository.SensorDataRepository,
 	deviceRepo repository.DeviceRepository,
-	deviceService device.Service,
+	deviceService device.DeviceOperator,
 ) plan.Task {
 	return &ReleaseFeedWeightTask{
 		ctx:            ctx,

internal/domain/task/task.go

@@ -29,7 +29,8 @@ type taskFactory struct {
 	alarmRepo          repository.AlarmRepository
 	areaControllerRepo repository.AreaControllerRepository
 
-	deviceService       device.Service
+	deviceOperator      device.DeviceOperator
+	deviceCommunicator  device.DeviceCommunicator
 	notificationService notify.Service
 	alarmService        alarm.AlarmService
 }
@@ -40,7 +41,8 @@ func NewTaskFactory(
 	deviceRepo repository.DeviceRepository,
 	alarmRepo repository.AlarmRepository,
 	areaControllerRepo repository.AreaControllerRepository,
-	deviceService device.Service,
+	deviceOperator device.DeviceOperator,
+	deviceCommunicator device.DeviceCommunicator,
 	notifyService notify.Service,
 	alarmService alarm.AlarmService,
 ) plan.TaskFactory {
@@ -50,7 +52,8 @@ func NewTaskFactory(
 		deviceRepo:          deviceRepo,
 		alarmRepo:           alarmRepo,
 		areaControllerRepo:  areaControllerRepo,
-		deviceService:       deviceService,
+		deviceOperator:      deviceOperator,
+		deviceCommunicator:  deviceCommunicator,
 		notificationService: notifyService,
 		alarmService:        alarmService,
 	}
@@ -63,11 +66,11 @@ func (t *taskFactory) Production(ctx context.Context, claimedLog *models.TaskExe
 	case models.TaskTypeWaiting:
 		return NewDelayTask(logs.AddCompName(baseCtx, CompNameDelayTask), claimedLog)
 	case models.TaskTypeReleaseFeedWeight:
-		return NewReleaseFeedWeightTask(logs.AddCompName(baseCtx, CompNameReleaseFeedWeight), claimedLog, t.sensorDataRepo, t.deviceRepo, t.deviceService)
+		return NewReleaseFeedWeightTask(logs.AddCompName(baseCtx, CompNameReleaseFeedWeight), claimedLog, t.sensorDataRepo, t.deviceRepo, t.deviceOperator)
 	case models.TaskTypeFullCollection:
-		return NewFullCollectionTask(logs.AddCompName(baseCtx, CompNameFullCollectionTask), claimedLog, t.deviceRepo, t.deviceService)
+		return NewFullCollectionTask(logs.AddCompName(baseCtx, CompNameFullCollectionTask), claimedLog, t.deviceRepo, t.deviceOperator)
 	case models.TaskTypeHeartbeat:
-		return NewHeartbeatTask(logs.AddCompName(baseCtx, CompNameHeartbeatTask), claimedLog, t.areaControllerRepo, t.deviceService)
+		return NewHeartbeatTask(logs.AddCompName(baseCtx, CompNameHeartbeatTask), claimedLog, t.areaControllerRepo, t.deviceCommunicator)
 	case models.TaskTypeAlarmNotification:
 		return NewAlarmNotificationTask(logs.AddCompName(baseCtx, CompNameAlarmNotification), claimedLog, t.notificationService, t.alarmRepo)
 	case models.TaskTypeDeviceThresholdCheck:
@@ -96,12 +99,12 @@ func (t *taskFactory) CreateTaskFromModel(ctx context.Context, taskModel *models
 			tempLog,
 			t.sensorDataRepo,
 			t.deviceRepo,
-			t.deviceService,
+			t.deviceOperator,
 		), nil
 	case models.TaskTypeFullCollection:
-		return NewFullCollectionTask(logs.AddCompName(baseCtx, CompNameFullCollectionTask), tempLog, t.deviceRepo, t.deviceService), nil
+		return NewFullCollectionTask(logs.AddCompName(baseCtx, CompNameFullCollectionTask), tempLog, t.deviceRepo, t.deviceOperator), nil
 	case models.TaskTypeHeartbeat:
-		return NewHeartbeatTask(logs.AddCompName(baseCtx, CompNameHeartbeatTask), tempLog, t.areaControllerRepo, t.deviceService), nil
+		return NewHeartbeatTask(logs.AddCompName(baseCtx, CompNameHeartbeatTask), tempLog, t.areaControllerRepo, t.deviceCommunicator), nil
 	case models.TaskTypeAlarmNotification:
 		return NewAlarmNotificationTask(logs.AddCompName(baseCtx, CompNameAlarmNotification), tempLog, t.notificationService, t.alarmRepo), nil
 	case models.TaskTypeDeviceThresholdCheck: