git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-22 17:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

加入ScheduleId到Task

Browse Source
This commit is contained in:
marvzhang
2020-03-20 08:33:30 +08:00
parent 7dc151f030
commit 3a40d0d2c7
5 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/model/task.go
View File

@@ -26,7 +26,7 @@ type Task struct {
TotalDuration float64 `json:"total_duration" bson:"total_duration"`
Pid int `json:"pid" bson:"pid"`
RunType string `json:"run_type" bson:"run_type"`
//ScheduleId bson.ObjectId `json:"schedule_id" bson:"schedule_id"`
ScheduleId bson.ObjectId `json:"schedule_id" bson:"schedule_id"`
// 前端数据
SpiderName string `json:"spider_name"`

31
backend/routes/spider.go
View File

@@ -627,11 +627,12 @@ func RunSelectedSpider(c *gin.Context) {
}
for _, node := range nodes {
t := model.Task{
SpiderId: taskParam.SpiderId,
NodeId: node.Id,
Param: taskParam.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeAllNodes,
SpiderId: taskParam.SpiderId,
NodeId: node.Id,
Param: taskParam.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeAllNodes,
ScheduleId: bson.ObjectIdHex(constants.ObjectIdNull),
}
id, err := services.AddTask(t)
@@ -645,10 +646,11 @@ func RunSelectedSpider(c *gin.Context) {
} else if reqBody.RunType == constants.RunTypeRandom {
// 随机
t := model.Task{
SpiderId: taskParam.SpiderId,
Param: taskParam.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeRandom,
SpiderId: taskParam.SpiderId,
Param: taskParam.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeRandom,
ScheduleId: bson.ObjectIdHex(constants.ObjectIdNull),
}
id, err := services.AddTask(t)
if err != nil {
@@ -660,11 +662,12 @@ func RunSelectedSpider(c *gin.Context) {
// 指定节点
for _, nodeId := range reqBody.NodeIds {
t := model.Task{
SpiderId: taskParam.SpiderId,
NodeId: nodeId,
Param: taskParam.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeSelectedNodes,
SpiderId: taskParam.SpiderId,
NodeId: nodeId,
Param: taskParam.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeSelectedNodes,
ScheduleId: bson.ObjectIdHex(constants.ObjectIdNull),
}
id, err := services.AddTask(t)

31
backend/routes/task.go
View File

@@ -112,11 +112,12 @@ func PutTask(c *gin.Context) {
}
for _, node := range nodes {
t := model.Task{
SpiderId: reqBody.SpiderId,
NodeId: node.Id,
Param: reqBody.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeAllNodes,
SpiderId: reqBody.SpiderId,
NodeId: node.Id,
Param: reqBody.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeAllNodes,
ScheduleId: bson.ObjectIdHex(constants.ObjectIdNull),
}
id, err := services.AddTask(t)
@@ -130,10 +131,11 @@ func PutTask(c *gin.Context) {
} else if reqBody.RunType == constants.RunTypeRandom {
// 随机
t := model.Task{
SpiderId: reqBody.SpiderId,
Param: reqBody.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeRandom,
SpiderId: reqBody.SpiderId,
Param: reqBody.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeRandom,
ScheduleId: bson.ObjectIdHex(constants.ObjectIdNull),
}
id, err := services.AddTask(t)
if err != nil {
@@ -145,11 +147,12 @@ func PutTask(c *gin.Context) {
// 指定节点
for _, nodeId := range reqBody.NodeIds {
t := model.Task{
SpiderId: reqBody.SpiderId,
NodeId: nodeId,
Param: reqBody.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeSelectedNodes,
SpiderId: reqBody.SpiderId,
NodeId: nodeId,
Param: reqBody.Param,
UserId: services.GetCurrentUserId(c),
RunType: constants.RunTypeSelectedNodes,
ScheduleId: bson.ObjectIdHex(constants.ObjectIdNull),
}
id, err := services.AddTask(t)

7
backend/services/challenge/run_random.go
View File

@@ -12,9 +12,10 @@ type RunRandomService struct {
func (s *RunRandomService) Check() (bool, error) {
query := bson.M{
"user_id": s.UserId,
"run_type": constants.RunTypeRandom,
"status": constants.StatusFinished,
"user_id": s.UserId,
"run_type": constants.RunTypeRandom,
"status": constants.StatusFinished,
"schedule_id": bson.ObjectIdHex(constants.ObjectIdNull),
}
list, err := model.GetTaskList(query, 0, 1, "-_id")
if err != nil {

34
backend/services/schedule.go
View File

@@ -51,11 +51,13 @@ func AddScheduleTask(s model.Schedule) func() {
}
for _, node := range nodes {
t := model.Task{
Id: id.String(),
SpiderId: s.SpiderId,
NodeId: node.Id,
Param: param,
UserId: s.UserId,
Id: id.String(),
SpiderId: s.SpiderId,
NodeId: node.Id,
Param: param,
UserId: s.UserId,
RunType: constants.RunTypeAllNodes,
ScheduleId: s.Id,
}
if _, err := AddTask(t); err != nil {
@@ -65,10 +67,12 @@ func AddScheduleTask(s model.Schedule) func() {
} else if s.RunType == constants.RunTypeRandom {
// 随机
t := model.Task{
Id: id.String(),
SpiderId: s.SpiderId,
Param: param,
UserId: s.UserId,
Id: id.String(),
SpiderId: s.SpiderId,
Param: param,
UserId: s.UserId,
RunType: constants.RunTypeRandom,
ScheduleId: s.Id,
}
if _, err := AddTask(t); err != nil {
log.Errorf(err.Error())
@@ -79,11 +83,13 @@ func AddScheduleTask(s model.Schedule) func() {
// 指定节点
for _, nodeId := range s.NodeIds {
t := model.Task{
Id: id.String(),
SpiderId: s.SpiderId,
NodeId: nodeId,
Param: param,
UserId: s.UserId,
Id: id.String(),
SpiderId: s.SpiderId,
NodeId: nodeId,
Param: param,
UserId: s.UserId,
RunType: constants.RunTypeSelectedNodes,
ScheduleId: s.Id,
}
if _, err := AddTask(t); err != nil {