From 1f76b3ebca318ce937277692cd34b68491145b52 Mon Sep 17 00:00:00 2001 From: zhanghan Date: Thu, 16 Oct 2025 13:41:17 +0800 Subject: [PATCH] Create task execution instruction file structure --- automation/agent/exec/model/common.go | 72 ++++++++++++++++++- .../internal/module/dangerous_rule/router.go | 1 - 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/automation/agent/exec/model/common.go b/automation/agent/exec/model/common.go index 73f6780b..1c726004 100644 --- a/automation/agent/exec/model/common.go +++ b/automation/agent/exec/model/common.go @@ -1,7 +1,73 @@ package model +// 任务和步骤执行说明 +type Task struct { + JobId string `json:"job_id"` + TaskStatus string `json:"status"` + CurrentStep int `json:"current_step"` + StartTime string `json:"start_time"` + EndTime string `json:"end_time"` + SubTasks []SubTask `json:"sub_tasks"` +} + +type SubTask struct { + ScriptId string `json:"script_id"` + StepNum int `json:"step_num"` + StepType string `json:"step_type"` + + Dependencies []int `json:"dependencies"` //依赖的步骤列表 + + ScriptTag string `json:"script_tag"` + ScriptType string `json:"script_type"` + ScriptContent string `json:"script_content"` + Params string `json:"params"` + TimeOut int `json:"time_out"` + + StepStatus string `json:"status"` + Result *CmdResult `json:"result"` +} + type CmdResult struct { - RetCode int - Stdout string - Stderr string + RetCode int `json:"ret_code"` + Stdout string `json:"stdout"` + Stderr string `json:"stderr"` + StartTime string `json:"start_time"` + EndTime string `json:"end_time"` } + +type TaskRequest struct { + JobId string `json:"job_id"` + SubTasks []SubTask `json:"sub_tasks"` +} + +type TaskResumeRequest struct { // 恢复任务请求 + JobId string `json:"job_id"` + StepNum string `json:"step_num"` + Action string `json:"action"` +} + +const ( + // 任务状态 + TaskStatusPending = "等待" + TaskStatusRunning = "运行中" + TaskStatusPaused = "已暂停" + TaskStatusCompleted = "已完成" + TaskStatusFailed = "失败" + TaskStatusCancelled = "已取消" + + // 步骤状态 + StepStatusPending = "等待" + StepStatusRunning = "运行中" + StepStatusCompleted = "已完成" + StepStatusFailed = "失败" + + // 步骤类型 + StepTypeExecTask = "任务" + StepTypeManualReview = "人工处理" + StepTypeProcessControl = "流程控制" + + // 恢复操作类型 + ResumeActionContinue = "继续" + ResumeActionSkip = "跳过" + ResumeActionCancel = "取消" +) diff --git a/automation/server/internal/module/dangerous_rule/router.go b/automation/server/internal/module/dangerous_rule/router.go index d7090bf9..1d6bbe02 100644 --- a/automation/server/internal/module/dangerous_rule/router.go +++ b/automation/server/internal/module/dangerous_rule/router.go @@ -15,5 +15,4 @@ func DangerousRuleHandler(router *gin.RouterGroup) { api.DELETE("/delete", controller.DeleteDangerousRuleHandler) api.POST("/detectRule", controller.DetectRealtimelyHandler) } - } -- Gitee