This commit is contained in:
邹宗楠
2022-10-21 15:34:45 +08:00
parent 947682cf88
commit 14a1403936
2 changed files with 5 additions and 2 deletions

View File

@@ -81,6 +81,7 @@ func (t *TcpClient) handleConn(c net.Conn) {
//6、监听心跳时间超过1分多钟就clear掉
//globals.SugarLogger.Debugf("handleConn timeout channel...: %v", t.TimeoutMap[printNo])
if t.Clients[printNo] == nil {
globals.SugarLogger.Debugf("==========print_no:%s", printNo)
t.addConn(c, printNo, status)
t.buildAllMap(printNo)
t.HandleTcpMessages(printNo)
@@ -96,7 +97,7 @@ func (t *TcpClient) handleConn(c net.Conn) {
}
} else {
//在加到连接池中已经更新了时间所以放在else里
t.setPrintStatusTime(printNo)
t.setPrintStatusTime(c, status, printNo)
}
//状态不一致再更新状态(可能缺纸了,过热了等)
if t.getPrintStatus(printNo) != status {

View File

@@ -255,12 +255,14 @@ func (t *TcpClient) setPrintStatus(key string, status int) {
}
}
func (t *TcpClient) setPrintStatusTime(key string) {
func (t *TcpClient) setPrintStatusTime(c net.Conn, status int, key string) {
t.Lock()
defer t.Unlock()
if t.Clients[key] != nil {
//t.Clients[key].Status = status
t.Clients[key].StatusTime = time.Now()
t.Clients[key].C = c
t.Clients[key].Status = status
}
}