liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-11-01 14:23:00 +08:00
parent 559e5ab7fa
commit f57cea0164
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxstore/event/event_tcp.go
View File

@@ -65,11 +65,11 @@ func (t *TcpClient) handleConn(c net.Conn) {
//} //}
//看是心跳还是打印回调 //看是心跳还是打印回调
data := hex.EncodeToString(buffer[:n]) data := hex.EncodeToString(buffer[:n])
globals.SugarLogger.Debugf("===========n := %s", n) globals.SugarLogger.Debugf("===========n := %d", n)
globals.SugarLogger.Debugf("===========buffer := %s", string(buffer)) globals.SugarLogger.Debugf("===========buffer := %s", string(buffer))
globals.SugarLogger.Debugf("===========data := %s", data) globals.SugarLogger.Debugf("===========data := %s", data)
//证明是心跳 //证明是心跳
if strings.Contains(data, heartText) { if strings.Contains(data, heartText) || strings.Contains(data, heartTextNew) {
globals.SugarLogger.Debugf("handleConn heart: %v", data) globals.SugarLogger.Debugf("handleConn heart: %v", data)
printNoData, _ := hex.DecodeString(data[len(heartText) : len(data)-8]) printNoData, _ := hex.DecodeString(data[len(heartText) : len(data)-8])
printNo = string(printNoData) printNo = string(printNoData)
@@ -109,7 +109,7 @@ func (t *TcpClient) handleConn(c net.Conn) {
changePrinterStatus(printNo, status) changePrinterStatus(printNo, status)
} }
globals.SugarLogger.Debugf("handleConn print model %v", utils.Format4Output(t.Clients[printNo], true)) globals.SugarLogger.Debugf("handleConn print model %v", utils.Format4Output(t.Clients[printNo], true))
} else if strings.Contains(data, printText) { //打印回调 } else if strings.Contains(data, printText) || strings.Contains(data, printTextNew) { //打印回调
globals.SugarLogger.Debugf("handleConn print callback: %v", data) globals.SugarLogger.Debugf("handleConn print callback: %v", data)
//打印消息发送后，打印机会回调该条打印消息的状态（打印成功or失败，失败原因..） //打印消息发送后，打印机会回调该条打印消息的状态（打印成功or失败，失败原因..）
//将回调的信息放到回调channel中，打印成功后再打印下一条消息 //将回调的信息放到回调channel中，打印成功后再打印下一条消息
@@ -143,7 +143,7 @@ func (t *TcpClient) changePrintMsg(data string, orderNo int64, printNo string) (
//1、先找出打印机编号和订单序列号，这两个确定唯一一条消息? //1、先找出打印机编号和订单序列号，这两个确定唯一一条消息?
//通过参数传进来 //通过参数传进来
//2、打印成功改变打印表的状态 //2、打印成功改变打印表的状态
if strings.Contains(data, printSuccessText) { if strings.Contains(data, printSuccessText) || strings.Contains(data, printSuccessTextNew) {
//1e001802000150323032313036313530303030313000013c 成功消息例子 //1e001802000150323032313036313530303030313000013c 成功消息例子
status = printMsgSuccess status = printMsgSuccess
} else { } else {

9
business/jxstore/event/event_tcp_utils.go
View File

@@ -17,9 +17,12 @@ import (
) )
const ( const (
heartText = "1e000f02000151" heartText = "1e000f02000151" // 老版心跳
printText = "1e00180200" heartTextNew = "1e001a02000151" // 新版心跳
printSuccessText = "1e001802000150" printText = "1e00180200" // 老版打印回调
printTextNew = "1e00190200" // 新版打印回调
printSuccessText = "1e001802000150" // 老版消息打印
printSuccessTextNew = "1e001902000150" // 新版消息打印
printErrWithoutPaper = "05" printErrWithoutPaper = "05"