admin/TaskPool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remark get and set #100

Browse Source
This commit is contained in:
duorameng
2026-05-12 16:27:07 +08:00
parent 2b0f37b7ea
commit e37deac281
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controllers/task_controller.go
+5 -3
View File
@@ -60,6 +60,7 @@ func resolveWorkDir(workDir string) string {
func (tc *TaskController) CreateTask(c *gin.Context) { func (tc *TaskController) CreateTask(c *gin.Context) {
var req struct { var req struct {
Name string `json:"name" binding:"required"` Name string `json:"name" binding:"required"`
Remark string `json:"remark"`
Command string `json:"command"` Command string `json:"command"`
PreCommand string `json:"pre_command"` PreCommand string `json:"pre_command"`
PostCommand string `json:"post_command"` PostCommand string `json:"post_command"`
@@ -121,12 +122,12 @@ func (tc *TaskController) CreateTask(c *gin.Context) {
if sourceID != "" { if sourceID != "" {
task = tc.taskService.GetTaskBySourceID(sourceID) task = tc.taskService.GetTaskBySourceID(sourceID)
if task != nil { if task != nil {
task = tc.taskService.UpdateTask(task.ID, req.Name, req.Command, req.PreCommand, req.PostCommand, req.Schedule, req.Timeout, workDir, req.CleanConfig, req.Envs, true, req.Type, req.Config, req.AgentID, req.Languages, req.TriggerType, req.Tags, req.RetryCount, req.RetryInterval, req.RandomRange, sourceID, req.PinType) task = tc.taskService.UpdateTask(task.ID, req.Name, req.Remark, req.Command, req.PreCommand, req.PostCommand, req.Schedule, req.Timeout, workDir, req.CleanConfig, req.Envs, true, req.Type, req.Config, req.AgentID, req.Languages, req.TriggerType, req.Tags, req.RetryCount, req.RetryInterval, req.RandomRange, sourceID, req.PinType)
} }
} }
if task == nil { if task == nil {
task = tc.taskService.CreateTask(req.Name, req.Command, req.PreCommand, req.PostCommand, req.Schedule, req.Timeout, workDir, req.CleanConfig, req.Envs, req.Type, req.Config, req.AgentID, req.Languages, req.TriggerType, req.Tags, req.RetryCount, req.RetryInterval, req.RandomRange, sourceID, req.PinType) task = tc.taskService.CreateTask(req.Name, req.Remark, req.Command, req.PreCommand, req.PostCommand, req.Schedule, req.Timeout, workDir, req.CleanConfig, req.Envs, req.Type, req.Config, req.AgentID, req.Languages, req.TriggerType, req.Tags, req.RetryCount, req.RetryInterval, req.RandomRange, sourceID, req.PinType)
} }
// 如果是 Agent 任务，通知 Agent；否则添加到本地 cron // 如果是 Agent 任务，通知 Agent；否则添加到本地 cron
@@ -226,6 +227,7 @@ func (tc *TaskController) UpdateTask(c *gin.Context) {
var req struct { var req struct {
Name string `json:"name"` Name string `json:"name"`
Remark string `json:"remark"`
Command string `json:"command"` Command string `json:"command"`
PreCommand string `json:"pre_command"` PreCommand string `json:"pre_command"`
PostCommand string `json:"post_command"` PostCommand string `json:"post_command"`
@@ -278,7 +280,7 @@ func (tc *TaskController) UpdateTask(c *gin.Context) {
sourceID = oldTask.SourceID sourceID = oldTask.SourceID
} }
task := tc.taskService.UpdateTask(id, req.Name, req.Command, req.PreCommand, req.PostCommand, req.Schedule, req.Timeout, workDir, req.CleanConfig, req.Envs, req.Enabled, req.Type, req.Config, req.AgentID, req.Languages, req.TriggerType, req.Tags, req.RetryCount, req.RetryInterval, req.RandomRange, sourceID, req.PinType) task := tc.taskService.UpdateTask(id, req.Name, req.Remark, req.Command, req.PreCommand, req.PostCommand, req.Schedule, req.Timeout, workDir, req.CleanConfig, req.Envs, req.Enabled, req.Type, req.Config, req.AgentID, req.Languages, req.TriggerType, req.Tags, req.RetryCount, req.RetryInterval, req.RandomRange, sourceID, req.PinType)
if task == nil { if task == nil {
utils.NotFound(c, "任务不存在") utils.NotFound(c, "任务不存在")
return return
internal/models/vo/task_vo.go
+2
View File
@@ -10,6 +10,7 @@ import (
type TaskVO struct { type TaskVO struct {
ID string `json:"id"` ID string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Remark string `json:"remark"`
Command string `json:"command"` Command string `json:"command"`
PreCommand string `json:"pre_command"` PreCommand string `json:"pre_command"`
PostCommand string `json:"post_command"` PostCommand string `json:"post_command"`
@@ -45,6 +46,7 @@ func ToTaskVO(task *models.Task) *TaskVO {
return &TaskVO{ return &TaskVO{
ID: task.ID, ID: task.ID,
Name: task.Name, Name: task.Name,
Remark: task.Remark,
Command: string(task.Command), Command: string(task.Command),
PreCommand: string(task.PreCommand), PreCommand: string(task.PreCommand),
PostCommand: string(task.PostCommand), PostCommand: string(task.PostCommand),
internal/services/tasks/task_service.go
+5 -3
View File
@@ -24,7 +24,7 @@ func (ts *TaskService) GetTaskBySourceID(sourceID string) *models.Task {
return &task return &task
} }
func (ts *TaskService) CreateTask(name, command, preCommand, postCommand, schedule string, timeout int, workDir, cleanConfig, envs, taskType, config string, agentID *string, languages models.TaskLanguages, triggerType string, tags string, retryCount int, retryInterval int, randomRange int, sourceID string, pinType string) *models.Task { func (ts *TaskService) CreateTask(name, remark, command, preCommand, postCommand, schedule string, timeout int, workDir, cleanConfig, envs, taskType, config string, agentID *string, languages models.TaskLanguages, triggerType string, tags string, retryCount int, retryInterval int, randomRange int, sourceID string, pinType string) *models.Task {
if taskType == "" { if taskType == "" {
taskType = "task" taskType = "task"
} }
@@ -37,6 +37,7 @@ func (ts *TaskService) CreateTask(name, command, preCommand, postCommand, schedu
task := &models.Task{ task := &models.Task{
ID: utils.GenerateID(), ID: utils.GenerateID(),
Name: name, Name: name,
Remark: remark,
Command: models.BigText(command), Command: models.BigText(command),
PreCommand: models.BigText(preCommand), PreCommand: models.BigText(preCommand),
PostCommand: models.BigText(postCommand), PostCommand: models.BigText(postCommand),
@@ -124,13 +125,14 @@ func (ts *TaskService) GetTaskByID(id string) *models.Task {
return &task return &task
} }
func (ts *TaskService) UpdateTask(id string, name, command, preCommand, postCommand, schedule string, timeout int, workDir, cleanConfig, envs string, enabled bool, taskType, config string, agentID *string, languages models.TaskLanguages, triggerType string, tags string, retryCount int, retryInterval int, randomRange int, sourceID string, pinType string) *models.Task { func (ts *TaskService) UpdateTask(id string, name, remark, command, preCommand, postCommand, schedule string, timeout int, workDir, cleanConfig, envs string, enabled bool, taskType, config string, agentID *string, languages models.TaskLanguages, triggerType string, tags string, retryCount int, retryInterval int, randomRange int, sourceID string, pinType string) *models.Task {
var task models.Task var task models.Task
res := database.DB.Where("id = ?", id).Limit(1).Find(&task) res := database.DB.Where("id = ?", id).Limit(1).Find(&task)
if res.Error != nil || res.RowsAffected == 0 { if res.Error != nil || res.RowsAffected == 0 {
return nil return nil
} }
task.Name = name task.Name = name
task.Remark = remark
task.Command = models.BigText(command) task.Command = models.BigText(command)
task.PreCommand = models.BigText(preCommand) task.PreCommand = models.BigText(preCommand)
task.PostCommand = models.BigText(postCommand) task.PostCommand = models.BigText(postCommand)
@@ -159,7 +161,7 @@ func (ts *TaskService) UpdateTask(id string, name, command, preCommand, postComm
} }
database.DB.Model(&task).Select( database.DB.Model(&task).Select(
"Name", "Command", "Tags", "Schedule", "Timeout", "WorkDir", "Name", "Remark", "Command", "Tags", "Schedule", "Timeout", "WorkDir",
"CleanConfig", "Envs", "Enabled", "AgentID", "Languages", "CleanConfig", "Envs", "Enabled", "AgentID", "Languages",
"RetryCount", "RetryInterval", "RandomRange", "Type", "RetryCount", "RetryInterval", "RandomRange", "Type",
"TriggerType", "Config", "SourceID", "PinType", "TriggerType", "Config", "SourceID", "PinType",