From eaa27cbaa748d91571232c0e399af1d9d351054b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 12 May 2026 17:28:46 +0800
Subject: [PATCH] 1

---
 business/jxstore/event/event_tcp.go       | 29 +++++++++++------------
 business/jxstore/event/event_tcp_utils.go | 18 --------------
 2 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go
index 3c0da4814..72956ba59 100644
--- a/business/jxstore/event/event_tcp.go
+++ b/business/jxstore/event/event_tcp.go
@@ -43,7 +43,7 @@ func ListenTcp() {
 				}
 			}()
 
-			if err := handleConn(c); err != nil {
+			if err = handleConn(c); err != nil {
 				c.Close()
 				Pool.Wait()
 				Pool.Stop()
@@ -61,11 +61,11 @@ func handleConn(c net.Conn) error {
 	for {
 		buffer, n, err := ConnRead(c)
 
-		remoteAddr := c.RemoteAddr().(*net.TCPAddr)
-		remoteIP := remoteAddr.IP.String() // 打印机IP
-		remotePort := remoteAddr.Port      // 打印机端口
-		globals.SugarLogger.Debugf("remoteIP1: %s", remoteIP)
-		globals.SugarLogger.Debugf("remotePort1: %d", remotePort)
+		//remoteAddr := c.RemoteAddr().(*net.TCPAddr)
+		//remoteIP := remoteAddr.IP.String() // 打印机IP
+		//remotePort := remoteAddr.Port      // 打印机端口
+		//globals.SugarLogger.Debugf("remoteIP1: %s", remoteIP)
+		//globals.SugarLogger.Debugf("remotePort1: %d", remotePort)
 
 		// 重连
 		if err != nil {
@@ -74,9 +74,6 @@ func handleConn(c net.Conn) error {
 			} else {
 				fmt.Println("ReadString err:", err)
 			}
-			printRemoteAddr22 := c.RemoteAddr().String()
-			printRemoteAddr22 = strings.Split(printRemoteAddr22, ":")[0]
-			globals.SugarLogger.Debugf("printRemoteAddr22: %s", printRemoteAddr22)
 			return err
 		}
 
@@ -98,12 +95,14 @@ func handleConn(c net.Conn) error {
 		}
 		globals.SugarLogger.Debugf("printNoData------: %s", printNo)
 
-		if value, have := TcpClientList.Load(printNo); !have {
-			t = NewTcpClient()
-			TcpClientList.Store(printNo, t)
-		} else {
-			t = value.(*TcpClient)
-		}
+		t = NewTcpClient()
+		TcpClientList.Delete(printNo)
+		TcpClientList.Store(printNo, t)
+		//if value, have := TcpClientList.Load(printNo); !have {
+		//	TcpClientList.Store(printNo, t)
+		//} else {
+		//	t = value.(*TcpClient)
+		//}
 		if heartbeat {
 			// 证明是心跳
 			Heartbeat(c, t, data, printNo, "")
diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go
index ea51a3279..6f186b0b6 100644
--- a/business/jxstore/event/event_tcp_utils.go
+++ b/business/jxstore/event/event_tcp_utils.go
@@ -745,24 +745,6 @@ func doPrint(t *TcpClient, key string) (err error) {
 						dao.UpdateEntity(db, printMsg, "Status", "Comment")
 						return
 					}
-
-					// 链接已经关闭了
-					//if isClosed(c) {
-					//	remoteAddr := c.RemoteAddr().(*net.TCPAddr)
-					//	remoteIP := remoteAddr.IP.String() // 打印机IP
-					//	remotePort := remoteAddr.Port      // 打印机端口
-					//	globals.SugarLogger.Debugf("remoteIP3: %s", remoteIP)
-					//	globals.SugarLogger.Debugf("remotePort3: %d", remotePort)
-					//
-					//	printRemoteAddr := c.RemoteAddr().String()
-					//	printRemoteAddr = strings.Split(printRemoteAddr, ":")[0]
-					//	globals.SugarLogger.Debugf("printRemoteAddr3: %s", printRemoteAddr)
-					//
-					//	c = reconnectPrinter(c)
-					//	if c != nil {
-					//		t.setPrintConn(printMsg.PrintNo, c)
-					//	}
-					//}
 					if _, err = c.Write(data); err != nil {
 						globals.SugarLogger.Debugf("handleTcpMessages err [%v]", err)
 					} else {