diff --git a/internal/app/controller/plan/plan_controller.go b/internal/app/controller/plan/plan_controller.go index cad8afe..5e30d13 100644 --- a/internal/app/controller/plan/plan_controller.go +++ b/internal/app/controller/plan/plan_controller.go @@ -6,7 +6,7 @@ import ( "git.huangwc.com/pig/pig-farm-controller/internal/app/controller" "git.huangwc.com/pig/pig-farm-controller/internal/app/dto" - "git.huangwc.com/pig/pig-farm-controller/internal/domain/task" + "git.huangwc.com/pig/pig-farm-controller/internal/domain/scheduler" "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" @@ -20,11 +20,11 @@ import ( type Controller struct { logger *logs.Logger planRepo repository.PlanRepository - analysisPlanTaskManager *task.AnalysisPlanTaskManager + analysisPlanTaskManager *scheduler.AnalysisPlanTaskManager } // NewController 创建一个新的 Controller 实例 -func NewController(logger *logs.Logger, planRepo repository.PlanRepository, analysisPlanTaskManager *task.AnalysisPlanTaskManager) *Controller { +func NewController(logger *logs.Logger, planRepo repository.PlanRepository, analysisPlanTaskManager *scheduler.AnalysisPlanTaskManager) *Controller { return &Controller{ logger: logger, planRepo: planRepo, diff --git a/internal/infra/models/plan.go b/internal/infra/models/plan.go index 15189fc..33a6cb7 100644 --- a/internal/infra/models/plan.go +++ b/internal/infra/models/plan.go @@ -52,12 +52,20 @@ const ( PlanStatusFailed PlanStatus = "执行失败" // 执行失败 ) +type PlanType string + +const ( + PlanTypeCustom PlanType = "自定义任务" + PlanTypeSystem PlanType = "系统任务" +) + // Plan 代表系统中的一个计划,可以包含子计划或任务 type Plan struct { gorm.Model Name string `gorm:"not null" json:"name"` Description string `json:"description"` + PlanType PlanType `gorm:"not null;index" json:"plan_type"` // 任务类型, 包括系统任务和用户自定义任务 ExecutionType PlanExecutionType `gorm:"not null;index" json:"execution_type"` Status PlanStatus `gorm:"default:'已禁用';index" json:"status"` // 计划是否被启动 ExecuteNum uint `gorm:"default:0" json:"execute_num"` // 计划预期执行次数