diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index 83988e6ec..fd0365bd4 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -89,12 +89,10 @@ func handleConn(c net.Conn) error { callback = true } - t, ok := PrintObject[printNo] - if !ok { - t = NewTcpClient() - buildAllMap(t, printNo) - PrintObject[printNo] = t - } + t := NewTcpClient() + buildAllMap(t, printNo) + PrintObject[printNo] = t + if strings.Contains(string(buffer[0:n]), "print_no_clear") { // 清理缓存 param := struct { PrintNoClear json.Number `json:"print_no_clear"` diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go index 4c825dc57..f8e95b0d7 100644 --- a/business/jxstore/event/event_tcp_utils.go +++ b/business/jxstore/event/event_tcp_utils.go @@ -652,7 +652,7 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string) { buildAllMap(t, printNo) //t.TimeoutMap[printNo] <- true HandleTcpMessages(t, printNo) - doPrint(t, printNo) + //doPrint(t, printNo) if status == printerStatusOnline { //t.printFail() } @@ -667,10 +667,10 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string) { //在加到连接池中已经更新了时间,所以放在else里 t.setPrintStatusTime(printNo) } + doPrint(t, printNo) //状态不一致再更新状态(可能缺纸了,过热了等) t.setPrintStatus(printNo, status) changePrinterStatus(printNo, status) - doPrint(t, printNo) } // Callback 打印成功回调