Commit 21d9cb53 authored by 贾浩@五瓣科技's avatar 贾浩@五瓣科技

fix

parent d42f82ff
...@@ -9,6 +9,7 @@ import ( ...@@ -9,6 +9,7 @@ import (
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
"gorm.io/gorm/logger"
) )
func (d *Dao) InitTaskAction() (err error) { func (d *Dao) InitTaskAction() (err error) {
...@@ -200,12 +201,9 @@ func (d *Dao) GetUnprocessedTasks() (tasks []*dbModel.TaskHistory, err error) { ...@@ -200,12 +201,9 @@ func (d *Dao) GetUnprocessedTasks() (tasks []*dbModel.TaskHistory, err error) {
`SELECT TH.* FROM %s AS TH JOIN %s AS T ON TH.task_id = T.id WHERE TH.status = ? AND ((T.platform = ? AND TH.created_at <= NOW() - INTERVAL '3 minutes') OR (T.platform != ? AND TH.created_at <= NOW() - INTERVAL '1 minutes'))`, `SELECT TH.* FROM %s AS TH JOIN %s AS T ON TH.task_id = T.id WHERE TH.status = ? AND ((T.platform = ? AND TH.created_at <= NOW() - INTERVAL '3 minutes') OR (T.platform != ? AND TH.created_at <= NOW() - INTERVAL '1 minutes'))`,
(&dbModel.TaskHistory{}).TableName(), (&dbModel.Task{}).TableName(), (&dbModel.TaskHistory{}).TableName(), (&dbModel.Task{}).TableName(),
) )
// ignore log
err = d.db.Raw(sql, constant.TaskHistoryStatusPending, constant.TaskPlatformTwitter, constant.TaskPlatformTwitter).Scan(&tasks).Error tx := d.db.Session(&gorm.Session{Logger: logger.Default.LogMode(logger.Error)})
err = tx.Raw(sql, constant.TaskHistoryStatusPending, constant.TaskPlatformTwitter, constant.TaskPlatformTwitter).Scan(&tasks).Error
// err = d.db.Model(&dbModel.TaskHistory{}).Where(
// "status = ? and created_at <= ?", constant.TaskHistoryStatusPending, gorm.Expr("NOW() - INTERVAL '3 minutes'"),
// ).Find(&tasks).Error
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment