pig/pig-farm-controller
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

issue_42 #46

Merged
huang merged 7 commits from issue_42 into main 2025-10-29 17:21:26 +08:00
Conversation 0 Commits 7 Files Changed 22 +11 -3
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 94e8768424 - Show all commits

6
internal/app/controller/plan/plan_controller.go
View File

@@ -6,7 +6,7 @@ import (
"git.huangwc.com/pig/pig-farm-controller/internal/app/controller" "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/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/logs"
"git.huangwc.com/pig/pig-farm-controller/internal/infra/models" "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/repository"
@@ -20,11 +20,11 @@ import (
type Controller struct { type Controller struct {
logger *logs.Logger logger *logs.Logger
planRepo repository.PlanRepository planRepo repository.PlanRepository
analysisPlanTaskManager *task.AnalysisPlanTaskManager analysisPlanTaskManager *scheduler.AnalysisPlanTaskManager
} }
// NewController 创建一个新的 Controller 实例 // 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{ return &Controller{
logger: logger, logger: logger,
planRepo: planRepo, planRepo: planRepo,

8
internal/infra/models/plan.go
View File

@@ -52,12 +52,20 @@ const (
PlanStatusFailed PlanStatus = "执行失败" // 执行失败 PlanStatusFailed PlanStatus = "执行失败" // 执行失败
) )
type PlanType string
const (
PlanTypeCustom PlanType = "自定义任务"
PlanTypeSystem PlanType = "系统任务"
)
// Plan 代表系统中的一个计划，可以包含子计划或任务 // Plan 代表系统中的一个计划，可以包含子计划或任务
type Plan struct { type Plan struct {
gorm.Model gorm.Model
Name string `gorm:"not null" json:"name"` Name string `gorm:"not null" json:"name"`
Description string `json:"description"` Description string `json:"description"`
PlanType PlanType `gorm:"not null;index" json:"plan_type"` // 任务类型, 包括系统任务和用户自定义任务
ExecutionType PlanExecutionType `gorm:"not null;index" json:"execution_type"` ExecutionType PlanExecutionType `gorm:"not null;index" json:"execution_type"`
Status PlanStatus `gorm:"default:'已禁用';index" json:"status"` // 计划是否被启动 Status PlanStatus `gorm:"default:'已禁用';index" json:"status"` // 计划是否被启动
ExecuteNum uint `gorm:"default:0" json:"execute_num"` // 计划预期执行次数 ExecuteNum uint `gorm:"default:0" json:"execute_num"` // 计划预期执行次数