1

business/jxstore/event/event_tcp.go

@@ -89,13 +89,12 @@ func handleConn(c net.Conn) error {
 			callback = true
 		}
 
-		if printNo == "120220915001467" {
+		t, ok := PrintObject[printNo]
-			globals.SugarLogger.Debugf("-----------1111")
+		if !ok {
-		}
+			t = NewTcpClient()
-		t := NewTcpClient()
 			buildAllMap(t, printNo)
 			PrintObject[printNo] = t
-
+		}
 		if strings.Contains(string(buffer[0:n]), "print_no_clear") { // 清理缓存
 			param := struct {
 				PrintNoClear json.Number `json:"print_no_clear"`
@@ -209,7 +208,6 @@ func doPrint(t *TcpClient, key string) (err error) {
 	)
 
 	if !t.isExistMsg(key) {
-		globals.SugarLogger.Debugf("==============:= %v", err)
 		return err
 	}
 
@@ -257,8 +255,7 @@ func doPrint(t *TcpClient, key string) (err error) {
 						printMsg.Status = printMsgErr
 						printMsg.Comment = err.Error()
 						dao.UpdateEntity(db, printMsg, "Status", "Comment")
-						globals.SugarLogger.Debugf("=====1 %v", err)
+						delete(PrintObject, key)
-						delete(t.TimeoutMap, key)
 						return
 					}
 
@@ -415,8 +412,6 @@ func doPrint(t *TcpClient, key string) (err error) {
 
 // HandleCheckTcpHeart 检测心跳
 func HandleCheckTcpHeart(t *TcpClient, key string) {
-	//fn := func() {
-	//for {
 	if t.TimeoutMap[key] == true {
 		statusTime := t.getPrintStatusTime(key)
 		if !utils.IsTimeZero(statusTime) {
@@ -435,7 +430,4 @@ func HandleCheckTcpHeart(t *TcpClient, key string) {
 		delete(PrintObject, key)
 		return
 	}
-	//}
-	//}
-	//Poll.AddJob(fn)
 }

business/jxstore/event/event_tcp_utils.go

@@ -647,13 +647,13 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string) {
 		buildAllMap(t, printNo)
 		//t.TimeoutMap[printNo] <- true
 		HandleTcpMessages(t, printNo)
-		//doPrint(t, printNo)
+		doPrint(t, printNo)
 		if status == printerStatusOnline {
 			//t.printFail()
 		}
 		changePrinterStatus(printNo, status)
 		// todo 暂时关闭心跳检测
-		// HandleCheckTcpHeart(t, printNo)
+		HandleCheckTcpHeart(t, printNo)
 		// todo 证明打印机已经被激活,将激活打印机存入数据库,保证用户不能无限制绑定打印机
 		if err := dao.NotExistsCreate(printNo); err != nil {
 			globals.SugarLogger.Debugf("监听打印机心跳,不存在则创建 :[%v],printNo[%s]", err, printNo)
@@ -662,7 +662,6 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string) {
 		//在加到连接池中已经更新了时间，所以放在else里
 		t.setPrintStatusTime(printNo)
 	}
-	doPrint(t, printNo)
 	//状态不一致再更新状态（可能缺纸了，过热了等）
 	t.setPrintStatus(printNo, status)
 	changePrinterStatus(printNo, status)