1
This commit is contained in:
@@ -181,43 +181,25 @@ func (t *TcpClient) HandleTcpMessages(printNo string) {
|
|||||||
go func() {
|
go func() {
|
||||||
for {
|
for {
|
||||||
if t.TimeoutMap[printNo] == true {
|
if t.TimeoutMap[printNo] == true {
|
||||||
timeNow := time.Now()
|
time.AfterFunc(2*time.Second, func() {
|
||||||
timeStart := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, timeNow.Location())
|
timeNow := time.Now()
|
||||||
timeEnd := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 23, 59, 59, 0, timeNow.Location())
|
timeStart := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, timeNow.Location())
|
||||||
prints, _ := dao.GetPrintMsgs(db, printNo, []int{printMsgWait}, timeStart.AddDate(0, 0, -1), timeEnd, offset, pageSize)
|
timeEnd := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 23, 59, 59, 0, timeNow.Location())
|
||||||
for _, printMsg := range prints {
|
prints, _ := dao.GetPrintMsgs(db, printNo, []int{printMsgWait}, timeStart.AddDate(0, 0, -1), timeEnd, offset, pageSize)
|
||||||
printMsg.Status = printMsgAlreadyLoad
|
for _, printMsg := range prints {
|
||||||
//先避免重复读再插到channel?
|
printMsg.Status = printMsgAlreadyLoad
|
||||||
if _, err := dao.UpdateEntity(db, printMsg, "Status"); err == nil {
|
//先避免重复读再插到channel?
|
||||||
if err = t.addMsgChan(printMsg); err != nil {
|
if _, err := dao.UpdateEntity(db, printMsg, "Status"); err == nil {
|
||||||
globals.SugarLogger.Debugf("HandleTcpMessages addMsgChan Err: %v", err)
|
if err = t.addMsgChan(printMsg); err != nil {
|
||||||
|
globals.SugarLogger.Debugf("HandleTcpMessages addMsgChan Err: %v", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
} else {
|
} else {
|
||||||
globals.SugarLogger.Debugf("HandleTcpMessages timeout")
|
globals.SugarLogger.Debugf("HandleTcpMessages timeout")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
//select {
|
|
||||||
//case <-t.TimeoutMap[printNo]:
|
|
||||||
// globals.SugarLogger.Debugf("HandleTcpMessages timeout")
|
|
||||||
// return
|
|
||||||
//default:
|
|
||||||
// //一直读?
|
|
||||||
// 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)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user