From 99cac55563d27448329660922b64f6eb615cfdb5 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Thu, 29 Jul 2021 15:59:01 +0800 Subject: [PATCH] rang --- business/jxstore/event/event_tcp.go | 6 +++++- business/jxstore/event/event_tcp_utils.go | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index c2f4242f4..ba73edf56 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -298,16 +298,20 @@ func (t *TcpClient) doPrint2(printMsgChan chan *model.PrintMsg) (err error) { func (t *TcpClient) HandleCheckTcpHeart() { for { keys := []string{} + t.RLock() for k, v := range t.Clients { if time.Now().Sub(v.StatusTime) > time.Minute+time.Second { v.Status = printerStatusOffline keys = append(keys, k) } } + t.RUnlock() for _, v := range keys { changePrinterStatus(v, printerStatusOffline) - if t.Clients[v] != nil { + if t.isExist(v) { + t.Lock() delete(t.Clients, v) + t.Unlock() } } } diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go index 40f0d8d85..f6fef65ce 100644 --- a/business/jxstore/event/event_tcp_utils.go +++ b/business/jxstore/event/event_tcp_utils.go @@ -86,7 +86,6 @@ const ( var ( //t = &TcpClient{} - printErrMap = map[string]string{ printErrWithoutPaper: "打印机缺纸!", }