From a57e665cc7392ed1110adac0d99765c9ae4eddaa Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Fri, 30 Jul 2021 09:17:51 +0800 Subject: [PATCH] aa --- business/jxstore/event/event_tcp.go | 58 ++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index 7c2f732d2..2e8b653a4 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -83,36 +83,36 @@ func (t *TcpClient) handleConn(c net.Conn) { printNo = string(printNoData) globals.SugarLogger.Debugf("handleConn printno :[%v]", printNo) status := printStatus2JxStatus(data[len(data)-8 : len(data)-6]) - if t.Clients[printNo] == nil { - //printInfo := &PrintInfo{ - // C: c, - // Status: printStatus2JxStatus(data[len(data)-8 : len(data)-6]), - // StatusTime: time.Now(), - //} - //t.Lock() - //t.Clients[printNo] = printInfo - //t.Unlock() - t.addConn(c, printNo, status) - t.buildCallBackMap(printNo) - changePrinterStatus(printNo, status) - if status == printerStatusOnline { - printFail() - } - } else { - //改变打印机状态 - //t.Lock() - //if t.Clients[printNo] != nil { - // if t.Clients[printNo].Status != status { - // t.Clients[printNo].Status = status - // } - // t.Clients[printNo].StatusTime = time.Now() - //} - //t.Unlock() - changePrinterStatus(printNo, status) - if t.getPrintStatus(printNo) != status { - t.setPrintStatus(printNo, status) - } + //if t.Clients[printNo] == nil { + //printInfo := &PrintInfo{ + // C: c, + // Status: printStatus2JxStatus(data[len(data)-8 : len(data)-6]), + // StatusTime: time.Now(), + //} + //t.Lock() + //t.Clients[printNo] = printInfo + //t.Unlock() + t.addConn(c, printNo, status) + t.buildCallBackMap(printNo) + changePrinterStatus(printNo, status) + if status == printerStatusOnline { + printFail() } + //} else { + //改变打印机状态 + //t.Lock() + //if t.Clients[printNo] != nil { + // if t.Clients[printNo].Status != status { + // t.Clients[printNo].Status = status + // } + // t.Clients[printNo].StatusTime = time.Now() + //} + //t.Unlock() + //changePrinterStatus(printNo, status) + if t.getPrintStatus(printNo) != status { + t.setPrintStatus(printNo, status) + } + //} } else if strings.Contains(data, printText) { globals.SugarLogger.Debugf("handleConn print callback: %v", data) _, printNo = getCallbackMsgInfo(data)