GeneralDeviceService 改为全局唯一使用靠注入

internal/app/service/task/scheduler.go

@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
+	"git.huangwc.com/pig/pig-farm-controller/internal/app/service/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"
-	"git.huangwc.com/pig/pig-farm-controller/internal/infra/transport"
 	"github.com/panjf2000/ants/v2"
 	"gorm.io/gorm"
 )
@@ -83,12 +83,10 @@ type Scheduler struct {
 	executionLogRepo        repository.ExecutionLogRepository
 	deviceRepo              repository.DeviceRepository
 	sensorDataRepo          repository.SensorDataRepository
-	deviceCommandLogRepo    repository.DeviceCommandLogRepository
-	pendingCollectionRepo   repository.PendingCollectionRepository
 	planRepo                repository.PlanRepository
-	comm                    transport.Communicator
 	analysisPlanTaskManager *AnalysisPlanTaskManager
 	progressTracker         *ProgressTracker
+	deviceService           device.Service
 
 	pool     *ants.Pool // 使用 ants 协程池来管理并发
 	wg       sync.WaitGroup
@@ -102,11 +100,9 @@ func NewScheduler(
 	deviceRepo repository.DeviceRepository,
 	sensorDataRepo repository.SensorDataRepository,
 	planRepo repository.PlanRepository,
-	comm transport.Communicator,
 	analysisPlanTaskManager *AnalysisPlanTaskManager,
 	logger *logs.Logger,
-	deviceCommandLogRepo repository.DeviceCommandLogRepository,
-	pendingCollectionRepo repository.PendingCollectionRepository,
+	deviceService device.Service,
 	interval time.Duration,
 	numWorkers int,
 ) *Scheduler {
@@ -116,11 +112,9 @@ func NewScheduler(
 		deviceRepo:              deviceRepo,
 		sensorDataRepo:          sensorDataRepo,
 		planRepo:                planRepo,
-		comm:                    comm,
 		analysisPlanTaskManager: analysisPlanTaskManager,
 		logger:                  logger,
-		deviceCommandLogRepo:    deviceCommandLogRepo,
-		pendingCollectionRepo:   pendingCollectionRepo,
+		deviceService:           deviceService,
 		pollingInterval:         interval,
 		workers:                 numWorkers,
 		progressTracker:         NewProgressTracker(),
@@ -296,7 +290,7 @@ func (s *Scheduler) taskFactory(claimedLog *models.TaskExecutionLog) Task {
 	case models.TaskTypeWaiting:
 		return NewDelayTask(s.logger, claimedLog)
 	case models.TaskTypeReleaseFeedWeight:
-		return NewReleaseFeedWeightTask(claimedLog, s.deviceRepo, s.sensorDataRepo, s.deviceCommandLogRepo, s.pendingCollectionRepo, s.comm, s.logger)
+		return NewReleaseFeedWeightTask(claimedLog, s.sensorDataRepo, s.deviceRepo, s.deviceService, s.logger)
 
 	default:
 		// TODO 这里直接panic合适吗? 不过这个场景确实不该出现任何异常的任务类型