diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index c142fbef3..db4458e1d 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -297,14 +297,9 @@ func (t *TcpClient) doPrint2(printMsgChan chan *model.PrintMsg) (err error) { globals.SugarLogger.Debugf("handleTcpMessages success, data: %v", hex.EncodeToString(data)) //printMsg.Status = printMsgAlreadySend //dao.UpdateEntity(db, printMsg, "Status") - if t.CallBackMap[printMsg.PrintNo] != nil { - select { - case dataStr := <-t.CallBackMap[printMsg.PrintNo]: - a, b := getCallbackMsgInfo(dataStr) - t.changePrintMsg(dataStr, a, b) - case <-timeoutChan: - } - } + dataStr := <-t.CallBackMap[printMsg.PrintNo] + a, b := getCallbackMsgInfo(dataStr) + t.changePrintMsg(dataStr, a, b) //dataStr := <-printMsgCallbackChan } } diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go index a8634b04f..c0921e7af 100644 --- a/business/jxstore/event/event_tcp_utils.go +++ b/business/jxstore/event/event_tcp_utils.go @@ -149,7 +149,6 @@ func (t *TcpClient) buildCallBackMap(key string) { defer t.Unlock() dataChan := make(chan string, 1024) t.CallBackMap[key] = dataChan - timeoutChan <- 1 } func (t *TcpClient) getPrintStatus(key string) int {