支持多台服务器同时执行任务+优化页面

一个定时任务可以允许多台服务器同时执行任务,优化页面关闭并刷新列表页
This commit is contained in:
georgehao
2019-04-16 23:40:07 +08:00
parent 07aff7ee72
commit 830d49ee1c
24 changed files with 391 additions and 137 deletions

View File

@@ -9,6 +9,8 @@ package models
import (
"fmt"
"strconv"
"strings"
"github.com/astaxie/beego/orm"
)
@@ -95,6 +97,22 @@ func TaskServerGetById(id int) (*TaskServer, error) {
return obj, nil
}
//
func TaskServerGetByIds(ids string) ([]*TaskServer, int64) {
serverFilters := make([]interface{}, 0)
//serverFilters = append(serverFilters, "status", 1)
TaskServerIdsArr := strings.Split(ids, ",")
TaskServerIds := make([]int, 0)
for _, v := range TaskServerIdsArr {
id, _ := strconv.Atoi(v)
TaskServerIds = append(TaskServerIds, id)
}
serverFilters = append(serverFilters, "id__in", TaskServerIds)
return TaskServerGetList(1, 1000, serverFilters...)
}
func TaskServerDelById(id int) error {
_, err := orm.NewOrm().QueryTable(TableName("task_server")).Filter("id", id).Delete()
return err

View File

@@ -23,7 +23,7 @@ const (
type Task struct {
Id int
GroupId int
ServerId int
ServerIds string
TaskName string
Description string
CronSpec string

View File

@@ -14,6 +14,8 @@ import (
type TaskLog struct {
Id int
TaskId int
ServerId int
ServerName string
Output string
Error string
Status int