定义ReleaseFeedWeightTask并注入依赖

internal/app/service/task/delay_task.go

@@ -20,22 +20,15 @@ type DelayTask struct {
 	logger        *logs.Logger
 }
 
-func NewDelayTask() Task {
-	return &DelayTask{}
+func NewDelayTask(logger *logs.Logger, executionTask *models.TaskExecutionLog) Task {
+	return &DelayTask{
+		executionTask: executionTask,
+		logger:        logger,
+	}
 }
 
 // Execute 执行延迟任务，等待指定的时间
 func (d *DelayTask) Execute() error {
-	d.logger.Infof("任务 %v: 开始延迟 %v...", d.executionTask.TaskID, d.duration)
-	time.Sleep(d.duration)
-	d.logger.Infof("任务 %v: 延迟结束。", d.executionTask.TaskID)
-	return nil
-}
-
-func (d *DelayTask) ParseParams(logger *logs.Logger, executionTask *models.TaskExecutionLog) error {
-	d.logger = logger
-	d.executionTask = executionTask
-
 	if d.executionTask.Task.Parameters == nil {
 		d.logger.Errorf("任务 %v: 缺少参数", d.executionTask.TaskID)
 		return fmt.Errorf("任务 %v: 参数不全", d.executionTask.TaskID)
@@ -54,6 +47,10 @@ func (d *DelayTask) ParseParams(logger *logs.Logger, executionTask *models.TaskE
 	}
 
 	d.duration = time.Duration(duration) * time.Second
+
+	d.logger.Infof("任务 %v: 开始延迟 %v...", d.executionTask.TaskID, d.duration)
+	time.Sleep(d.duration)
+	d.logger.Infof("任务 %v: 延迟结束。", d.executionTask.TaskID)
 	return nil
 }
 

internal/app/service/task/release_feed_weight_task.go

@@ -0,0 +1,36 @@
+package task
+
+import (
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/transport"
+)
+
+// ReleaseFeedWeightTask 是一个控制下料口释放指定重量的任务
+type ReleaseFeedWeightTask struct {
+	deviceRepo     repository.DeviceRepository
+	sensorDataRepo repository.SensorDataRepository
+
+	comm transport.Communicator
+
+	logger *logs.Logger
+}
+
+func (r *ReleaseFeedWeightTask) Execute() error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (r *ReleaseFeedWeightTask) OnFailure(executeErr error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+// NewReleaseFeedWeightTask 创建一个新的 ReleaseFeedWeightTask 实例
+func NewReleaseFeedWeightTask(deviceRepo repository.DeviceRepository, sensorDataRepo repository.SensorDataRepository, comm transport.Communicator) Task {
+	return &ReleaseFeedWeightTask{
+		deviceRepo:     deviceRepo,
+		sensorDataRepo: sensorDataRepo,
+		comm:           comm,
+	}
+}

internal/app/service/task/scheduler.go

@@ -9,6 +9,7 @@ import (
 	"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"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/transport"
 	"github.com/panjf2000/ants/v2"
 	"gorm.io/gorm"
 )
@@ -80,8 +81,11 @@ type Scheduler struct {
 	workers                 int
 	pendingTaskRepo         repository.PendingTaskRepository
 	executionLogRepo        repository.ExecutionLogRepository
+	deviceRepo              repository.DeviceRepository
+	sensorDataRepo          repository.SensorDataRepository
 	planRepo                repository.PlanRepository
-	analysisPlanTaskManager *AnalysisPlanTaskManager // <--- 注入共享的 Manager
+	comm                    transport.Communicator
+	analysisPlanTaskManager *AnalysisPlanTaskManager
 	progressTracker         *ProgressTracker
 
 	pool     *ants.Pool // 使用 ants 协程池来管理并发
@@ -93,16 +97,22 @@ type Scheduler struct {
 func NewScheduler(
 	pendingTaskRepo repository.PendingTaskRepository,
 	executionLogRepo repository.ExecutionLogRepository,
+	deviceRepo repository.DeviceRepository,
+	sensorDataRepo repository.SensorDataRepository,
 	planRepo repository.PlanRepository,
-	analysisPlanTaskManager *AnalysisPlanTaskManager, // <--- 注入 Manager
+	comm transport.Communicator,
+	analysisPlanTaskManager *AnalysisPlanTaskManager,
 	logger *logs.Logger,
 	interval time.Duration,
 	numWorkers int) *Scheduler {
 	return &Scheduler{
 		pendingTaskRepo:         pendingTaskRepo,
 		executionLogRepo:        executionLogRepo,
+		deviceRepo:              deviceRepo,
+		sensorDataRepo:          sensorDataRepo,
 		planRepo:                planRepo,
-		analysisPlanTaskManager: analysisPlanTaskManager, // <--- 注入 Manager
+		comm:                    comm,
+		analysisPlanTaskManager: analysisPlanTaskManager,
 		logger:                  logger,
 		pollingInterval:         interval,
 		workers:                 numWorkers,
@@ -261,11 +271,7 @@ func (s *Scheduler) runTask(claimedLog *models.TaskExecutionLog) error {
 
 	} else {
 		// 执行普通任务
-		task := s.taskFactory(claimedLog.Task.Type)
-		if err := task.ParseParams(s.logger, claimedLog); err != nil {
-			s.logger.Errorf("[严重] 任务参数解析失败, 日志ID: %d, 错误: %v", claimedLog.ID, err)
-			return err
-		}
+		task := s.taskFactory(claimedLog)
 
 		if err := task.Execute(); err != nil {
 			s.logger.Errorf("[严重] 任务执行失败, 日志ID: %d, 错误: %v", claimedLog.ID, err)
@@ -278,10 +284,13 @@ func (s *Scheduler) runTask(claimedLog *models.TaskExecutionLog) error {
 }
 
 // taskFactory 会根据任务类型初始化对应任务
-func (s *Scheduler) taskFactory(taskType models.TaskType) Task {
-	switch taskType {
+func (s *Scheduler) taskFactory(claimedLog *models.TaskExecutionLog) Task {
+	switch claimedLog.Task.Type {
 	case models.TaskTypeWaiting:
-		return NewDelayTask()
+		return NewDelayTask(s.logger, claimedLog)
+	case models.TaskTypeReleaseFeedWeight:
+		return NewReleaseFeedWeightTask(s.deviceRepo, s.sensorDataRepo, s.comm)
+
 	default:
 		// TODO 这里直接panic合适吗? 不过这个场景确实不该出现任何异常的任务类型
 		panic("不支持的任务类型")

internal/app/service/task/task.go

@@ -1,7 +1,6 @@
 package task
 
 import (
-	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
 )
 
@@ -13,9 +12,6 @@ type Task interface {
 	// 返回的 error 表示任务是否执行成功。调度器会根据返回的 error 是否为 nil 来决定任务状态。
 	Execute() error
 
-	// ParseParams 解析及校验参数
-	ParseParams(logger *logs.Logger, claimedLog *models.TaskExecutionLog) error
-
 	// OnFailure 定义了当 Execute 方法返回错误时，需要执行的回滚或清理逻辑。
 	// log: 任务执行的上下文。
 	// executeErr: 从 Execute 方法返回的原始错误。