From d4243f398b84a8b8cdcd27c35ace72f6a30a6452 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 08 十月 2023 10:45:09 +0800
Subject: [PATCH] 是否可以开始增加开始时间判断，考虑进程退出和断电情况
---
api/v1/task.go | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 419316b..ef93b90 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -68,10 +68,14 @@
return
}
+ taskCount := service.NewTaskService().NewTaskCount()
params.Page = 1
-
if params.PageSize <= 0 {
- params.PageSize = channelAmount
+ if params.TaskMode == constvar.TaskModeUnStarted {
+ params.PageSize = int(taskCount)
+ } else {
+ params.PageSize = channelAmount
+ }
}
taskMode := constvar.TaskModeCurrent
@@ -107,15 +111,16 @@
return taskResponse.Tasks[i].Channel < taskResponse.Tasks[i].Channel
})
+ nowTs := time.Now().Unix()
for _, task := range taskResponse.Tasks {
- if !service.TaskFlagGet(task.Channel) {
+ if !service.TaskFlagGet(task.Channel) && task.Procedure.StartTime <= nowTs {
task.CanStarted = true
}
}
taskResponse.Prompt = conf.Conf.Prompt
taskResponse.ChannelAmount = channelAmount
- taskResponse.TaskCount = service.NewTaskService().NewTaskCount()
+ taskResponse.TaskCount = taskCount
ctx.OkWithDetailed(taskResponse)
}
--
Gitblit v1.8.0