issue-18 优化代码(只保证编译通过没检查)

internal/app/service/task/release_feed_weight_task.go

@@ -21,28 +21,40 @@ type ReleaseFeedWeightTaskParams struct {
 
 // ReleaseFeedWeightTask 是一个控制下料口释放指定重量的任务
 type ReleaseFeedWeightTask struct {
-	deviceRepo     repository.DeviceRepository
-	sensorDataRepo repository.SensorDataRepository
-	claimedLog     *models.TaskExecutionLog
+	deviceRepo            repository.DeviceRepository
+	sensorDataRepo        repository.SensorDataRepository
+	deviceCommandLogRepo  repository.DeviceCommandLogRepository
+	pendingCollectionRepo repository.PendingCollectionRepository
+	claimedLog            *models.TaskExecutionLog
 
 	feedPortDevice     *models.Device // 下料口基本信息
 	releaseWeight      float64        // 需要释放的重量
 	mixingTankDeviceID uint           // 搅拌罐称重传感器ID
 
 	comm     transport.Communicator
-	feedPort *device.GeneralDeviceService // 下料口指令下发器
+	feedPort device.Service
 
 	logger *logs.Logger
 }
 
 // NewReleaseFeedWeightTask 创建一个新的 ReleaseFeedWeightTask 实例
-func NewReleaseFeedWeightTask(claimedLog *models.TaskExecutionLog, deviceRepo repository.DeviceRepository, sensorDataRepo repository.SensorDataRepository, comm transport.Communicator, logger *logs.Logger) Task {
+func NewReleaseFeedWeightTask(
+	claimedLog *models.TaskExecutionLog,
+	deviceRepo repository.DeviceRepository,
+	sensorDataRepo repository.SensorDataRepository,
+	deviceCommandLogRepo repository.DeviceCommandLogRepository,
+	pendingCollectionRepo repository.PendingCollectionRepository,
+	comm transport.Communicator,
+	logger *logs.Logger,
+) Task {
 	return &ReleaseFeedWeightTask{
-		claimedLog:     claimedLog,
-		deviceRepo:     deviceRepo,
-		sensorDataRepo: sensorDataRepo,
-		comm:           comm,
-		logger:         logger,
+		claimedLog:            claimedLog,
+		deviceRepo:            deviceRepo,
+		sensorDataRepo:        sensorDataRepo,
+		deviceCommandLogRepo:  deviceCommandLogRepo,
+		pendingCollectionRepo: pendingCollectionRepo,
+		comm:                  comm,
+		logger:                logger,
 	}
 }
 
@@ -140,7 +152,7 @@ func (r *ReleaseFeedWeightTask) parseParameters() error {
 
 	r.releaseWeight = params.ReleaseWeight
 	r.mixingTankDeviceID = params.MixingTankDeviceID
-	r.feedPort = device.NewGeneralDeviceService(r.deviceRepo, r.logger, r.comm)
+	r.feedPort = device.NewGeneralDeviceService(r.deviceRepo, r.deviceCommandLogRepo, r.pendingCollectionRepo, r.logger, r.comm)
 	r.feedPortDevice, err = r.deviceRepo.FindByID(params.FeedPortDeviceID)
 	if err != nil {
 		r.logger.Errorf("任务 %v: 获取设备信息失败: %v", r.claimedLog.TaskID, err)

internal/app/service/task/scheduler.go

@@ -83,6 +83,8 @@ 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
@@ -103,8 +105,11 @@ func NewScheduler(
 	comm transport.Communicator,
 	analysisPlanTaskManager *AnalysisPlanTaskManager,
 	logger *logs.Logger,
+	deviceCommandLogRepo repository.DeviceCommandLogRepository,
+	pendingCollectionRepo repository.PendingCollectionRepository,
 	interval time.Duration,
-	numWorkers int) *Scheduler {
+	numWorkers int,
+) *Scheduler {
 	return &Scheduler{
 		pendingTaskRepo:         pendingTaskRepo,
 		executionLogRepo:        executionLogRepo,
@@ -114,6 +119,8 @@ func NewScheduler(
 		comm:                    comm,
 		analysisPlanTaskManager: analysisPlanTaskManager,
 		logger:                  logger,
+		deviceCommandLogRepo:    deviceCommandLogRepo,
+		pendingCollectionRepo:   pendingCollectionRepo,
 		pollingInterval:         interval,
 		workers:                 numWorkers,
 		progressTracker:         NewProgressTracker(),
@@ -289,7 +296,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.comm, s.logger)
+		return NewReleaseFeedWeightTask(claimedLog, s.deviceRepo, s.sensorDataRepo, s.deviceCommandLogRepo, s.pendingCollectionRepo, s.comm, s.logger)
 
 	default:
 		// TODO 这里直接panic合适吗? 不过这个场景确实不该出现任何异常的任务类型