aa

business/jxstore/event/event_tcp.go

@@ -111,7 +111,8 @@ var (
 	regexpQrr   = regexp.MustCompile(byteSignQrRight + "(.*?)" + byteSignQrRightE)
 	regexpSound = regexp.MustCompile(byteSignSound + "(.*?)" + byteSignSoundE)
 
-	printMsgChan     = make(chan interface{})
+	printMsgChan         = make(chan *model.PrintMsg)
+	printMsgCallbackChan = make(chan string)
 	printMsgChanFail     = make(chan *model.PrintMsg)
 )
 
@@ -227,7 +228,7 @@ func handleConn(c net.Conn) {
 			}
 		} else if strings.Contains(data, printText) {
 			globals.SugarLogger.Debugf("handleConn print callback: %v", data)
-			printMsgChan <- data
+			printMsgCallbackChan <- data
 			//changePrintMsg(data)
 		}
 	}
@@ -370,33 +371,21 @@ func HandleTcpMessages() {
 		prints, _ := dao.GetPrintMsgs(db, []int{printMsgWait}, time.Now().Add(-time.Hour*3), time.Now(), offset, pageSize)
 		for _, printMsg := range prints {
 			printMsgChan <- printMsg
-			printMsg.Status = printMsgAlreadyLoad
-			dao.UpdateEntity(db, printMsg, "Status")
-		flag:
-			for {
-				obj, _ := <-printMsgChan
-				if _, ok := obj.(*model.PrintMsg); ok {
-					continue
-				} else {
-					if data, ok2 := obj.(string); ok2 {
+			select {
+			case data, _ := <-printMsgCallbackChan:
 				changePrintMsg(data)
-						break flag
-					}
-				}
 			}
 		}
 	}
 }
 
-func doPrint2(printMsgChan chan interface{}) (err error) {
+func doPrint2(printMsgChan chan *model.PrintMsg) (err error) {
 	var (
 		db = dao.GetDB()
 	)
 	for {
 		select {
-		case obj, _ := <-printMsgChan:
-			printMsg, ok := obj.(*model.PrintMsg)
-			if ok {
+		case printMsg, _ := <-printMsgChan:
 			var (
 				data []byte
 				c    net.Conn
@@ -444,7 +433,6 @@ func doPrint2(printMsgChan chan interface{}) (err error) {
 			}
 		}
 	}
-	}
 }
 
 func HandleCheckTcpHeart() {