1
This commit is contained in:
@@ -4,9 +4,9 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
)
|
)
|
||||||
|
|
||||||
var PrintObject = make(map[string]*TcpClient, 10) // 缓存的打印机对象
|
var PrintObject = make(map[string]*TcpClient, 100) // 缓存的打印机对象
|
||||||
var PrintAddrAndIp = make(map[string]string, 10) // 缓存打印机地址:[ip:printNo] event 文件包,connect只能获取到addr
|
var PrintAddrAndIp = make(map[string]string, 100) // 缓存打印机地址:[ip:printNo] event 文件包,connect只能获取到addr
|
||||||
var PrintIpAndAddr = make(map[string]string, 10) // 缓存打印机地址:[printNo:ip] api_controller 只能获取到printNo
|
var PrintIpAndAddr = make(map[string]string, 100) // 缓存打印机地址:[printNo:ip] api_controller 只能获取到printNo
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
fmt.Println("初始化打印机对象")
|
fmt.Println("初始化打印机对象")
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ func handleConn(c net.Conn) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
t, ok := PrintObject[printNo]
|
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()
|
t = NewTcpClient()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -646,7 +646,7 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemot
|
|||||||
//4、读打印channel并打印,并切等待回调channel中的消息
|
//4、读打印channel并打印,并切等待回调channel中的消息
|
||||||
//5、修改数据库中打印机状态(没在连接池中说明是重新连接的)
|
//5、修改数据库中打印机状态(没在连接池中说明是重新连接的)
|
||||||
//6、监听心跳时间,超过1分多钟就clear掉
|
//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)
|
addConn(c, t, printNo, status)
|
||||||
buildAllMap(t, printNo)
|
buildAllMap(t, printNo)
|
||||||
//t.TimeoutMap[printNo] <- true
|
//t.TimeoutMap[printNo] <- true
|
||||||
|
|||||||
Reference in New Issue
Block a user