jinql
/
gocron
mirror of https://github.com/ouqiang/gocron
1
0
Fork 0
Code Issues Releases Wiki Activity

延时任务初始化, 取出待执行、执行中的任务

pull/21/merge
ouqiang 2017-05-23 15:42:22 +08:00
parent ed521f519b
commit df0db4b843
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/delay_task.go
View File

@ -31,14 +31,14 @@ func (task *DelayTask) Create() (insertId int64, err error) {
func (task *DelayTask) ActiveList(endTime time.Time) ([]DelayTask, error) { func (task *DelayTask) ActiveList(endTime time.Time) ([]DelayTask, error) {
list := make([]DelayTask, 0) list := make([]DelayTask, 0)
fields := "id,url,params,delay,created" fields := "id,url,params,delay,created"
err := Db.Where("status = ? AND created <= ?", Waiting, endTime.Format(DefaultTimeFormat)).Cols(fields).Limit(task.PageSize, task.pageLimitOffset()).Find(&list) err := Db.Where("status IN (?, ?) AND created <= ?", Waiting, Running, endTime.Format(DefaultTimeFormat)).Cols(fields).Limit(task.PageSize, task.pageLimitOffset()).Find(&list)
return list, err return list, err
} }
// 获取待执行任务数量 // 获取待执行任务数量
func (task *DelayTask) ActiveNum(endTime time.Time) (int, error) { func (task *DelayTask) ActiveNum(endTime time.Time) (int, error) {
count ,err := Db.Where("status = ? AND created <= ?", Waiting, endTime.Format(DefaultTimeFormat)).Count(task) count ,err := Db.Where("status IN (?, ?) AND created <= ?", Waiting, Running, endTime.Format(DefaultTimeFormat)).Count(task)
return int(count), err return int(count), err
} }