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 13:30:18 +08:00
parent 8613ac0861
commit f3b7e22f23
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ func ListenTcp() {
if err := handleConn(c); err != nil { if err := handleConn(c); err != nil {
globals.SugarLogger.Debugf("=========err := %v", err) globals.SugarLogger.Debugf("=========err := %v", err)
c.Close()
Poll.Wait() Poll.Wait()
Poll.Stop() Poll.Stop()
return return

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

@@ -636,7 +636,6 @@ func xtob(x string) string {
// Heartbeat 心跳回调 // Heartbeat 心跳回调
func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemoteAddr string) { func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemoteAddr string) {
globals.SugarLogger.Debugf("==================1")
//printNoData, _ := hex.DecodeString(data[len(heartText) : len(data)-8]) //printNoData, _ := hex.DecodeString(data[len(heartText) : len(data)-8])
//printNo = string(printNoData) //printNo = string(printNoData)
status := printStatus2JxStatus(data[len(data)-8 : len(data)-6]) status := printStatus2JxStatus(data[len(data)-8 : len(data)-6])
@@ -648,41 +647,32 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemot
//5、修改数据库中打印机状态（没在连接池中说明是重新连接的） //5、修改数据库中打印机状态（没在连接池中说明是重新连接的）
//6、监听心跳时间，超过1分多钟就clear掉 //6、监听心跳时间，超过1分多钟就clear掉
if t.getClients(printNo) == nil || t == nil { if t.getClients(printNo) == nil || t == nil {
globals.SugarLogger.Debugf("==================2")
addConn(c, t, printNo, status) addConn(c, t, printNo, status)
buildAllMap(t, printNo) buildAllMap(t, printNo)
globals.SugarLogger.Debugf("==================3")
//t.TimeoutMap[printNo] <- true //t.TimeoutMap[printNo] <- true
HandleTcpMessages(t, printNo) HandleTcpMessages(t, printNo)
globals.SugarLogger.Debugf("==================4")
doPrint(t, printNo) doPrint(t, printNo)
if status == printerStatusOnline { if status == printerStatusOnline {
//t.printFail() //t.printFail()
} }
globals.SugarLogger.Debugf("==================5")
changePrinterStatus(printNo, status) changePrinterStatus(printNo, status)
globals.SugarLogger.Debugf("==================6")
// todo 暂时关闭心跳检测 // todo 暂时关闭心跳检测
HandleCheckTcpHeart(t, printNo) HandleCheckTcpHeart(t, printNo)
// todo 证明打印机已经被激活,将激活打印机存入数据库,保证用户不能无限制绑定打印机 // todo 证明打印机已经被激活,将激活打印机存入数据库,保证用户不能无限制绑定打印机
globals.SugarLogger.Debugf("==================7")
if err := dao.NotExistsCreate(printNo); err != nil { if err := dao.NotExistsCreate(printNo); err != nil {
globals.SugarLogger.Debugf("监听打印机心跳,不存在则创建 :[%v],printNo[%s]", err, printNo) globals.SugarLogger.Debugf("监听打印机心跳,不存在则创建 :[%v],printNo[%s]", err, printNo)
} }
globals.SugarLogger.Debugf("==================8")
PrintObject[printNo] = t PrintObject[printNo] = t
PrintAddrAndIp[printRemoteAddr] = printNo PrintAddrAndIp[printRemoteAddr] = printNo
PrintIpAndAddr[printNo] = printRemoteAddr PrintIpAndAddr[printNo] = printRemoteAddr
} else { } else {
globals.SugarLogger.Debugf("==================9")
//在加到连接池中已经更新了时间，所以放在else里 //在加到连接池中已经更新了时间，所以放在else里
t.setPrintStatusTime(printNo) t.setPrintStatusTime(printNo)
} }
//状态不一致再更新状态（可能缺纸了，过热了等） //状态不一致再更新状态（可能缺纸了，过热了等）
t.setPrintStatus(printNo, status) t.setPrintStatus(printNo, status)
changePrinterStatus(printNo, status) changePrinterStatus(printNo, status)
globals.SugarLogger.Debugf("==================10")
} }
// Callback 打印成功回调 // Callback 打印成功回调