This commit is contained in:
邹宗楠
2024-07-19 09:18:50 +08:00
parent 2a0d749ef5
commit fa87217b90

View File

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