liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-07-30 09:17:51 +08:00
parent fe68ba1dac
commit a57e665cc7
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
business/jxstore/event/event_tcp.go
View File

@@ -83,36 +83,36 @@ func (t *TcpClient) handleConn(c net.Conn) {
printNo = string(printNoData) printNo = string(printNoData)
globals.SugarLogger.Debugf("handleConn printno :[%v]", printNo) globals.SugarLogger.Debugf("handleConn printno :[%v]", printNo)
status := printStatus2JxStatus(data[len(data)-8 : len(data)-6]) status := printStatus2JxStatus(data[len(data)-8 : len(data)-6])
if t.Clients[printNo] == nil { //if t.Clients[printNo] == nil {
//printInfo := &PrintInfo{ //printInfo := &PrintInfo{
// C: c, // C: c,
// Status: printStatus2JxStatus(data[len(data)-8 : len(data)-6]), // Status: printStatus2JxStatus(data[len(data)-8 : len(data)-6]),
// StatusTime: time.Now(), // StatusTime: time.Now(),
//} //}
//t.Lock() //t.Lock()
//t.Clients[printNo] = printInfo //t.Clients[printNo] = printInfo
//t.Unlock() //t.Unlock()
t.addConn(c, printNo, status) t.addConn(c, printNo, status)
t.buildCallBackMap(printNo) t.buildCallBackMap(printNo)
changePrinterStatus(printNo, status) changePrinterStatus(printNo, status)
if status == printerStatusOnline { if status == printerStatusOnline {
printFail() 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 {
//改变打印机状态
//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) { } else if strings.Contains(data, printText) {
globals.SugarLogger.Debugf("handleConn print callback: %v", data) globals.SugarLogger.Debugf("handleConn print callback: %v", data)
_, printNo = getCallbackMsgInfo(data) _, printNo = getCallbackMsgInfo(data)