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:
邹宗楠
2025-02-06 13:36:53 +08:00
parent 3251816066
commit 810eefd386
4 changed files with 118 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,10 +71,10 @@ func handleConn(c net.Conn) error {
} else {
fmt.Println("ReadString err:", err)
}
if printNo, ok := PrintAddrAndIp[printRemoteAddr]; ok {
delete(PrintIpAndAddr, printNo)
delete(PrintObject, printNo)
delete(PrintAddrAndIp, printRemoteAddr)
if printNo, ok := PrintAddrAndIp.GetPrintAddrAndIp(printRemoteAddr); ok {
PrintAddrAndIp.DelPrintAddrAndIp(printRemoteAddr)
PrintObject.DelPrintObj(printNo)
PrintIpAndAddr.DelPrintIpAndAddr(printRemoteAddr)
dao.ExecuteSQL(dao.GetDB(), `UPDATE printer SET status = -1,is_online = -1 WHERE print_no = ? `, []interface{}{printNo}...)
}
return err
@@ -96,8 +96,8 @@ func handleConn(c net.Conn) error {
callback = true
}
t, ok := PrintObject[printNo]
if !ok || t.Clients[printNo] == nil || t.Clients[printNo].StatusTime.Sub(time.Now()).Seconds() >= 120 {
t, ok := PrintObject.GetPrintObj(printNo)
if !ok || t.Clients[printNo] == nil || time.Now().Sub(t.Clients[printNo].StatusTime).Seconds() >= 120 {
t = NewTcpClient()
}
@@ -241,10 +241,10 @@ func doPrint(t *TcpClient, key string) (err error) {
}
if c == nil {
if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key)
if printRemoteAddrIP, have := PrintIpAndAddr.GetPrintIpAndAddr(key); have {
PrintIpAndAddr.DelPrintIpAndAddr(key)
PrintAddrAndIp.DelPrintAddrAndIp(printRemoteAddrIP)
PrintObject.DelPrintObj(key)
}
return
}
@@ -254,20 +254,20 @@ func doPrint(t *TcpClient, key string) (err error) {
printMsg.Comment = err.Error()
dao.UpdateEntity(db, printMsg, "Status", "Comment")
if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key)
if printRemoteAddrIP, have := PrintIpAndAddr.GetPrintIpAndAddr(key); have {
PrintIpAndAddr.DelPrintIpAndAddr(key)
PrintAddrAndIp.DelPrintAddrAndIp(printRemoteAddrIP)
PrintObject.DelPrintObj(key)
}
return
}
if _, err = c.Write(data); err != nil {
globals.SugarLogger.Debugf("handleTcpMessages err [%v]", err)
if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key)
if printRemoteAddrIP, have := PrintIpAndAddr.GetPrintIpAndAddr(key); have {
PrintIpAndAddr.DelPrintIpAndAddr(key)
PrintAddrAndIp.DelPrintAddrAndIp(printRemoteAddrIP)
PrintObject.DelPrintObj(key)
}
} else {
@@ -427,10 +427,10 @@ func HandleCheckTcpHeart(t *TcpClient, key string) {
changePrinterStatus(key, printerStatusOffline)
// 链接出错,彻底删除换成
if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key)
if printRemoteAddrIP, have := PrintIpAndAddr.GetPrintIpAndAddr(key); have {
PrintIpAndAddr.DelPrintIpAndAddr(key)
PrintAddrAndIp.DelPrintAddrAndIp(printRemoteAddrIP)
PrintObject.DelPrintObj(key)
}
}
@@ -442,10 +442,10 @@ func HandleCheckTcpHeart(t *TcpClient, key string) {
t.delConn(key)
// 链接出错,彻底删除换成
if printRemoteAddrIP, have := PrintIpAndAddr[key]; have {
delete(PrintIpAndAddr, PrintAddrAndIp[key])
delete(PrintAddrAndIp, printRemoteAddrIP)
delete(PrintObject, key)
if printRemoteAddrIP, have := PrintIpAndAddr.GetPrintIpAndAddr(key); have {
PrintIpAndAddr.DelPrintIpAndAddr(key)
PrintAddrAndIp.DelPrintAddrAndIp(printRemoteAddrIP)
PrintObject.DelPrintObj(key)
}
return