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-15 15:24:52 +08:00
parent 1565ed626b
commit de98b0f88a
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,6 +112,7 @@ func handleConn(c net.Conn) error {
// c.Write([]byte("ok")) // c.Write([]byte("ok"))
// return err // return err
//} //}
globals.SugarLogger.Debugf("=================1")
if heartbeat { if heartbeat {
// 证明是心跳 // 证明是心跳
Heartbeat(c, t, data, printNo, printRemoteAddr) Heartbeat(c, t, data, printNo, printRemoteAddr)

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

@@ -647,17 +647,24 @@ 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)
globals.SugarLogger.Debugf("=================3")
buildAllMap(t, printNo) buildAllMap(t, printNo)
globals.SugarLogger.Debugf("=================4")
//t.TimeoutMap[printNo] <- true //t.TimeoutMap[printNo] <- true
HandleTcpMessages(t, printNo) HandleTcpMessages(t, printNo)
globals.SugarLogger.Debugf("=================5")
doPrint(t, printNo) doPrint(t, printNo)
globals.SugarLogger.Debugf("=================6")
if status == printerStatusOnline { if status == printerStatusOnline {
//t.printFail() //t.printFail()
} }
changePrinterStatus(printNo, status) changePrinterStatus(printNo, status)
globals.SugarLogger.Debugf("=================7")
// todo 暂时关闭心跳检测 // todo 暂时关闭心跳检测
HandleCheckTcpHeart(t, printNo) HandleCheckTcpHeart(t, printNo)
globals.SugarLogger.Debugf("=================8")
// todo 证明打印机已经被激活,将激活打印机存入数据库,保证用户不能无限制绑定打印机 // todo 证明打印机已经被激活,将激活打印机存入数据库,保证用户不能无限制绑定打印机
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)
@@ -666,6 +673,7 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemot
PrintObject[printNo] = t PrintObject[printNo] = t
PrintAddrAndIp[printRemoteAddr] = printNo PrintAddrAndIp[printRemoteAddr] = printNo
PrintIpAndAddr[printNo] = printRemoteAddr PrintIpAndAddr[printNo] = printRemoteAddr
globals.SugarLogger.Debugf("=================9")
} else { } else {
//在加到连接池中已经更新了时间，所以放在else里 //在加到连接池中已经更新了时间，所以放在else里
t.setPrintStatusTime(printNo) t.setPrintStatusTime(printNo)
@@ -673,6 +681,7 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemot
//状态不一致再更新状态（可能缺纸了，过热了等） //状态不一致再更新状态（可能缺纸了，过热了等）
t.setPrintStatus(printNo, status) t.setPrintStatus(printNo, status)
changePrinterStatus(printNo, status) changePrinterStatus(printNo, status)
globals.SugarLogger.Debugf("=================10")
} }
// Callback 打印成功回调 // Callback 打印成功回调