From 43f8d0e62397c5d9c4756fed36ed53565c04f46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 16 Dec 2022 13:46:03 +0800 Subject: [PATCH] 1 --- business/jxstore/event/event_tcp.go | 33 ++++++++++++++++------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index b6a7bcbcb..b6cf15610 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -159,25 +159,28 @@ func (t *TcpClient) HandleTcpMessages(printNo string) { return } go func() { - for { - select { - case <-t.TimeoutMap[printNo]: - globals.SugarLogger.Debugf("HandleTcpMessages timeout") - return - default: - //一直读？ - prints, _ := dao.GetPrintMsgs(db, printNo, []int{printMsgWait}, time.Now().Add(-time.Hour*3), time.Now(), 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) - } + //for { + 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, printMsgAlreadyLoad}, timeStart, 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) } } } } + //} }() } func (t *TcpClient) readTimeoutMap(key string) bool {