|
@@ -1423,6 +1423,7 @@ func RunTask() {
|
|
|
if tools.IsStart { //是否开启定时任务
|
|
|
tt := InitTimeTask() //初始化任务
|
|
|
//StartTask(tt)
|
|
|
+ //return
|
|
|
c := cron.New()
|
|
|
cronstr := "0 */" + fmt.Sprint(tt.I_rate) + " * * * ?" //每TaskTime分钟执行一次
|
|
|
c.AddFunc(cronstr, func() { StartTask(tt) })
|
|
@@ -1449,19 +1450,19 @@ func InitTimeTask() *TTask {
|
|
|
func StartTask(t *TTask) {
|
|
|
defer util.Catch()
|
|
|
logger.Debug("开始执行定时任务")
|
|
|
- queryid := map[string]interface{}{
|
|
|
+ query := map[string]interface{}{
|
|
|
"_id": map[string]interface{}{
|
|
|
"$gt": u.StringTOBsonId(tools.IdCollSid),
|
|
|
},
|
|
|
- "isused": true,
|
|
|
+ "dataprocess": 8,
|
|
|
}
|
|
|
order := map[string]interface{}{"_id": -1}
|
|
|
- logger.Debug("search ocr_flie_over query:", queryid)
|
|
|
- list, _ := tools.MgoClass.Find(t.S_idcoll, queryid, order, nil, false, -1, -1)
|
|
|
+ logger.Debug("query:", query)
|
|
|
+ list, _ := tools.MgoClass.Find(t.S_idcoll, query, order, nil, false, -1, -1)
|
|
|
sid := t.S_startid
|
|
|
eid := ""
|
|
|
if list != nil && len(*list) > 0 {
|
|
|
- eid = util.ObjToString((*list)[0]["gtid"])
|
|
|
+ eid = util.ObjToString((*list)[0]["lteid"])
|
|
|
if eid <= sid {
|
|
|
logger.Debug("id err. sid:", sid, " eid:", eid)
|
|
|
return
|
|
@@ -1490,9 +1491,6 @@ func StartTask(t *TTask) {
|
|
|
if count == 0 { //此轮任务没有查到数据
|
|
|
return
|
|
|
}
|
|
|
- logger.Debug("stopping...")
|
|
|
- time.Sleep(10 * time.Minute) //取到id段后延迟10分钟再执行
|
|
|
- logger.Debug("running...")
|
|
|
arr := [][]map[string]interface{}{}
|
|
|
wg := &sync.WaitGroup{}
|
|
|
lock := &sync.Mutex{}
|