This commit is contained in:
邹宗楠
2024-07-19 09:11:22 +08:00
parent 2151ea27a9
commit 2a0d749ef5

View File

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