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-29 18:25:00 +08:00
parent b18672e92d
commit 37440aa104
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ func (t *TcpClient) handleConn(c net.Conn) {
//t.Lock() //t.Lock()
//t.Clients[printNo] = printInfo //t.Clients[printNo] = printInfo
//t.Unlock() //t.Unlock()
t.addConn(c, printNo, printStatus2JxStatus(data[len(data)-8:len(data)-6])) t.addConn(c, printNo, status)
t.buildCallBackMap(printNo) t.buildCallBackMap(printNo)
changePrinterStatus(printNo, status) changePrinterStatus(printNo, status)
if status == printerStatusOnline { if status == printerStatusOnline {
@@ -298,10 +298,14 @@ func (t *TcpClient) doPrint2(printMsgChan chan *model.PrintMsg) (err error) {
dao.UpdateEntity(db, printMsg, "Status", "Comment") dao.UpdateEntity(db, printMsg, "Status", "Comment")
if t.CallBackMap[printMsg.PrintNo] != nil { if t.CallBackMap[printMsg.PrintNo] != nil {
t.RLock() t.RLock()
dataStr := <-t.CallBackMap[printMsg.PrintNo] select {
case dataStr := <-t.CallBackMap[printMsg.PrintNo]:
a, b := getCallbackMsgInfo(dataStr)
t.changePrintMsg(dataStr, a, b)
case <-timeoutChan:
}
t.RUnlock() t.RUnlock()
a, b := getCallbackMsgInfo(dataStr)
t.changePrintMsg(dataStr, a, b)
} }
//dataStr := <-printMsgCallbackChan //dataStr := <-printMsgCallbackChan
} }

4
business/jxstore/event/event_tcp_utils.go
View File

@@ -102,6 +102,7 @@ var (
printMsgChan = make(chan *model.PrintMsg, 1024) printMsgChan = make(chan *model.PrintMsg, 1024)
//printMsgCallbackMap = make(map[string]chan string, 1024) //printMsgCallbackMap = make(map[string]chan string, 1024)
printMsgChanFail = make(chan *model.PrintMsg, 1024) printMsgChanFail = make(chan *model.PrintMsg, 1024)
timeoutChan = make(chan int, 10)
) )
type PrintInfo struct { type PrintInfo struct {
@@ -144,8 +145,11 @@ func (t *TcpClient) addConn(c net.Conn, key string, status int) {
} }
func (t *TcpClient) buildCallBackMap(key string) { func (t *TcpClient) buildCallBackMap(key string) {
t.Lock()
defer t.Unlock()
dataChan := make(chan string, 1024) dataChan := make(chan string, 1024)
t.CallBackMap[key] = dataChan t.CallBackMap[key] = dataChan
timeoutChan <- 1
} }
func (t *TcpClient) getPrintStatus(key string) int { func (t *TcpClient) getPrintStatus(key string) int {