1

business/jxstore/event/event_tcp_utils.go

@@ -646,7 +646,7 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemot
 	//4、读打印channel并打印，并切等待回调channel中的消息
 	//5、修改数据库中打印机状态（没在连接池中说明是重新连接的）
 	//6、监听心跳时间，超过1分多钟就clear掉
-	if t.getClients(printNo) == nil || t == nil || t.getPrintStatusTime(printNo).IsZero() || t.Clients[printNo].StatusTime.Sub(time.Now()).Seconds() >= 120 {
+	if t.getClients(printNo) == nil || t == nil || t.getPrintStatusTime(printNo).IsZero() || time.Now().Sub(t.Clients[printNo].StatusTime).Seconds() >= 120 {
 		addConn(c, t, printNo, status)
 		buildAllMap(t, printNo)
 		//t.TimeoutMap[printNo] <- true
@@ -663,9 +663,9 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemot
 			globals.SugarLogger.Debugf("监听打印机心跳,不存在则创建 :[%v],printNo[%s]", err, printNo)
 		}
 
-		PrintObject[printNo] = t
-		PrintAddrAndIp[printRemoteAddr] = printNo
-		PrintIpAndAddr[printNo] = printRemoteAddr
+		PrintObject.SetPrintObj(printNo, t)
+		PrintAddrAndIp.SetPrintAddrAndIp(printRemoteAddr, printNo)
+		PrintIpAndAddr.SetPrintIpAndAddr(printNo, printRemoteAddr)
 	} else {
 		//在加到连接池中已经更新了时间，所以放在else里
 		t.setPrintStatusTime(printNo)