From 1dd3d024ac71c1050072fd2f2ecfd1aa0218e4cb Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 22 Jul 2021 11:00:37 +0800
Subject: [PATCH] aa

---
 business/jxstore/event/event_tcp.go | 81 ++++++++++++++---------------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go
index 93c00cc8c..c74e52e35 100644
--- a/business/jxstore/event/event_tcp.go
+++ b/business/jxstore/event/event_tcp.go
@@ -383,56 +383,55 @@ func doPrint2(printMsgChan chan *model.PrintMsg) (err error) {
 	var (
 		db = dao.GetDB()
 	)
-	for {
-		select {
-		case printMsg, _ := <-printMsgChan:
-			var (
-				data []byte
-				c    net.Conn
-			)
-			if printMsg != nil {
-				if err = checkPrintMsg(db, printMsg); err == nil {
-					tcpClient.s.RLock()
-					if tcpClient.Clients[printMsg.PrintNo] != nil {
-						if tcpClient.Clients[printMsg.PrintNo].Status == printerStatusOnline {
-							if tcpClient.Clients[printMsg.PrintNo].C != nil {
-								c = tcpClient.Clients[printMsg.PrintNo].C
-								data, err = buildMsg(printMsg)
-							}
-						} else if tcpClient.Clients[printMsg.PrintNo].Status == printerStatusOffline {
-							err = fmt.Errorf("打印机离线！")
-						} else if tcpClient.Clients[printMsg.PrintNo].Status == printerStatusOnlineWithoutPaper {
-							err = fmt.Errorf("打印机缺纸！")
+	select {
+	case printMsg, _ := <-printMsgChan:
+		var (
+			data []byte
+			c    net.Conn
+		)
+		if printMsg != nil {
+			if err = checkPrintMsg(db, printMsg); err == nil {
+				tcpClient.s.RLock()
+				if tcpClient.Clients[printMsg.PrintNo] != nil {
+					if tcpClient.Clients[printMsg.PrintNo].Status == printerStatusOnline {
+						if tcpClient.Clients[printMsg.PrintNo].C != nil {
+							c = tcpClient.Clients[printMsg.PrintNo].C
+							data, err = buildMsg(printMsg)
 						}
+					} else if tcpClient.Clients[printMsg.PrintNo].Status == printerStatusOffline {
+						err = fmt.Errorf("打印机离线！")
+					} else if tcpClient.Clients[printMsg.PrintNo].Status == printerStatusOnlineWithoutPaper {
+						err = fmt.Errorf("打印机缺纸！")
 					}
-					tcpClient.s.RUnlock()
 				}
-			} else {
-				err = fmt.Errorf("未查询到此printMsg")
+				tcpClient.s.RUnlock()
 			}
-			if err != nil {
-				printMsg.Status = printMsgErr
-				printMsg.Comment = err.Error()
-				dao.UpdateEntity(db, printMsg, "Status", "Comment")
-				delete(tcpClient.Clients, printMsg.PrintNo)
-				if c != nil {
+		} else {
+			err = fmt.Errorf("未查询到此printMsg")
+		}
+		if err != nil {
+			printMsg.Status = printMsgErr
+			printMsg.Comment = err.Error()
+			dao.UpdateEntity(db, printMsg, "Status", "Comment")
+			delete(tcpClient.Clients, printMsg.PrintNo)
+			if c != nil {
+				c.Close()
+			}
+		} else {
+			if c != nil {
+				if _, err = c.Write(data); err != nil {
+					globals.SugarLogger.Debugf("handleTcpMessages err [%v]", err)
+					delete(tcpClient.Clients, printMsg.PrintNo)
 					c.Close()
-				}
-			} else {
-				if c != nil {
-					if _, err = c.Write(data); err != nil {
-						globals.SugarLogger.Debugf("handleTcpMessages err [%v]", err)
-						delete(tcpClient.Clients, printMsg.PrintNo)
-						c.Close()
-					} else {
-						globals.SugarLogger.Debugf("handleTcpMessages success, data: %v", hex.EncodeToString(data))
-						printMsg.Status = printMsgAlreadySend
-						dao.UpdateEntity(db, printMsg, "Status", "Comment")
-					}
+				} else {
+					globals.SugarLogger.Debugf("handleTcpMessages success, data: %v", hex.EncodeToString(data))
+					printMsg.Status = printMsgAlreadySend
+					dao.UpdateEntity(db, printMsg, "Status", "Comment")
 				}
 			}
 		}
 	}
+	return err
 }
 
 func HandleCheckTcpHeart() {