1
This commit is contained in:
@@ -209,37 +209,10 @@ func (t *TcpClient) HandleTcpMessages(printNo string) {
|
||||
return
|
||||
}
|
||||
|
||||
fn := func() {
|
||||
for {
|
||||
if t.TimeoutMap[printNo] == true {
|
||||
//if time.Now().Unix()%3 == 0 {
|
||||
timeNow := time.Now()
|
||||
timeStart := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, timeNow.Location())
|
||||
timeEnd := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 23, 59, 59, 0, timeNow.Location())
|
||||
prints, _ := dao.GetPrintMsgs(db, printNo, []int{printMsgWait}, timeStart.AddDate(0, 0, -1), timeEnd, offset, pageSize)
|
||||
for _, printMsg := range prints {
|
||||
printMsg.Status = printMsgAlreadyLoad
|
||||
//先避免重复读再插到channel?
|
||||
if _, err := dao.UpdateEntity(db, printMsg, "Status"); err == nil {
|
||||
if err = t.addMsgChan(printMsg); err != nil {
|
||||
globals.SugarLogger.Debugf("HandleTcpMessages addMsgChan Err: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
//} else {
|
||||
// continue
|
||||
//}
|
||||
} else {
|
||||
globals.SugarLogger.Debugf("HandleTcpMessages timeout")
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
Poll.AddJob(fn)
|
||||
|
||||
//go func() {
|
||||
//fn := func() {
|
||||
// for {
|
||||
// if t.TimeoutMap[printNo] == true {
|
||||
// //if time.Now().Unix()%3 == 0 {
|
||||
// timeNow := time.Now()
|
||||
// timeStart := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, timeNow.Location())
|
||||
// timeEnd := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 23, 59, 59, 0, timeNow.Location())
|
||||
@@ -253,12 +226,39 @@ func (t *TcpClient) HandleTcpMessages(printNo string) {
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// //} else {
|
||||
// // continue
|
||||
// //}
|
||||
// } else {
|
||||
// globals.SugarLogger.Debugf("HandleTcpMessages timeout")
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
//}()
|
||||
//}
|
||||
//Poll.AddJob(fn)
|
||||
|
||||
go func() {
|
||||
for {
|
||||
if t.TimeoutMap[printNo] == true {
|
||||
timeNow := time.Now()
|
||||
timeStart := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, timeNow.Location())
|
||||
timeEnd := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 23, 59, 59, 0, timeNow.Location())
|
||||
prints, _ := dao.GetPrintMsgs(db, printNo, []int{printMsgWait}, timeStart.AddDate(0, 0, -1), timeEnd, offset, pageSize)
|
||||
for _, printMsg := range prints {
|
||||
printMsg.Status = printMsgAlreadyLoad
|
||||
//先避免重复读再插到channel?
|
||||
if _, err := dao.UpdateEntity(db, printMsg, "Status"); err == nil {
|
||||
if err = t.addMsgChan(printMsg); err != nil {
|
||||
globals.SugarLogger.Debugf("HandleTcpMessages addMsgChan Err: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
globals.SugarLogger.Debugf("HandleTcpMessages timeout")
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func (t *TcpClient) readTimeoutMap(key string) bool {
|
||||
|
||||
Reference in New Issue
Block a user