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

1

Browse Source
This commit is contained in:
邹宗楠
2024-07-19 09:11:22 +08:00
parent 2151ea27a9
commit 2a0d749ef5
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ func ListenTcp() {
}() }()
if err := handleConn(c); err != nil { if err := handleConn(c); err != nil {
globals.SugarLogger.Debugf("=========err := %v", err)
Poll.Wait() Poll.Wait()
Poll.Stop() Poll.Stop()
return return
@@ -69,9 +70,11 @@ func handleConn(c net.Conn) error {
} else { } else {
fmt.Println("ReadString err:", err) fmt.Println("ReadString err:", err)
} }
delete(PrintIpAndAddr, PrintAddrAndIp[printRemoteAddr]) if printNo, ok := PrintAddrAndIp[printRemoteAddr]; ok {
delete(PrintObject, PrintAddrAndIp[printRemoteAddr]) delete(PrintIpAndAddr, printNo)
delete(PrintAddrAndIp, printRemoteAddr) delete(PrintObject, printNo)
delete(PrintAddrAndIp, printRemoteAddr)
}
return err return err
} }
@@ -252,10 +255,11 @@ func doPrint(t *TcpClient, key string) (err error) {
} }
if c == nil { if c == nil {
printRemoteAddrIP := PrintIpAndAddr[key] if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key]) delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP) delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key) delete(PrintObject, key)
}
return return
} }
@@ -264,19 +268,22 @@ func doPrint(t *TcpClient, key string) (err error) {
printMsg.Comment = err.Error() printMsg.Comment = err.Error()
dao.UpdateEntity(db, printMsg, "Status", "Comment") dao.UpdateEntity(db, printMsg, "Status", "Comment")
printRemoteAddrIP := PrintIpAndAddr[key] if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key]) delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP) delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key) delete(PrintObject, key)
}
return return
} }
if _, err = c.Write(data); err != nil { if _, err = c.Write(data); err != nil {
globals.SugarLogger.Debugf("handleTcpMessages err [%v]", err) globals.SugarLogger.Debugf("handleTcpMessages err [%v]", err)
printRemoteAddrIP := PrintIpAndAddr[key] if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key]) delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP) delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key) delete(PrintObject, key)
}
} else { } else {
//等待回调 //等待回调
dataStr := <-t.CallBackMap[key] dataStr := <-t.CallBackMap[key]
@@ -434,10 +441,12 @@ func HandleCheckTcpHeart(t *TcpClient, key string) {
changePrinterStatus(key, printerStatusOffline) changePrinterStatus(key, printerStatusOffline)
// 链接出错,彻底删除换成 // 链接出错,彻底删除换成
printRemoteAddrIP := PrintIpAndAddr[key] if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key]) delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP) delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key) delete(PrintObject, key)
}
} }
} }
} else { } else {
@@ -447,10 +456,12 @@ func HandleCheckTcpHeart(t *TcpClient, key string) {
t.delConn(key) t.delConn(key)
// 链接出错,彻底删除换成 // 链接出错,彻底删除换成
printRemoteAddrIP := PrintIpAndAddr[key] if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key]) delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP) delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key) delete(PrintObject, key)
}
return return
} }
} }