This commit is contained in:
邹宗楠
2024-11-04 10:53:16 +08:00
parent 90ff64452a
commit 3251816066
3 changed files with 5 additions and 5 deletions

View File

@@ -4,9 +4,9 @@ import (
"fmt"
)
var PrintObject = make(map[string]*TcpClient, 10) // 缓存的打印机对象
var PrintAddrAndIp = make(map[string]string, 10) // 缓存打印机地址:[ip:printNo] event 文件包,connect只能获取到addr
var PrintIpAndAddr = make(map[string]string, 10) // 缓存打印机地址:[printNo:ip] api_controller 只能获取到printNo
var PrintObject = make(map[string]*TcpClient, 100) // 缓存的打印机对象
var PrintAddrAndIp = make(map[string]string, 100) // 缓存打印机地址:[ip:printNo] event 文件包,connect只能获取到addr
var PrintIpAndAddr = make(map[string]string, 100) // 缓存打印机地址:[printNo:ip] api_controller 只能获取到printNo
func init() {
fmt.Println("初始化打印机对象")

View File

@@ -97,7 +97,7 @@ func handleConn(c net.Conn) error {
}
t, ok := PrintObject[printNo]
if !ok || t.Clients[printNo] == nil || t.Clients[printNo].StatusTime.Second()-time.Now().Second() >= 120 {
if !ok || t.Clients[printNo] == nil || t.Clients[printNo].StatusTime.Sub(time.Now()).Seconds() >= 120 {
t = NewTcpClient()
}

View File

@@ -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.Second()-time.Now().Second() >= 120 {
if t.getClients(printNo) == nil || t == nil || t.getPrintStatusTime(printNo).IsZero() || t.Clients[printNo].StatusTime.Sub(time.Now()).Seconds() >= 120 {
addConn(c, t, printNo, status)
buildAllMap(t, printNo)
//t.TimeoutMap[printNo] <- true