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:
邹宗楠
2024-07-10 10:59:43 +08:00
parent 2de089f09a
commit e3fedfdcd2
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,6 @@ func handleConn(c net.Conn) error {
if c == nil { if c == nil {
return errors.New("conn is nil") return errors.New("conn is nil")
} }
//nowPrintNo := ""
for { for {
buffer, n, err := ConnRead(c) buffer, n, err := ConnRead(c)
if err != nil { if err != nil {
@@ -71,11 +70,6 @@ func handleConn(c net.Conn) error {
} else { } else {
fmt.Println("ReadString err:", err) fmt.Println("ReadString err:", err)
} }
//if nowPrintNo != "" {
// globals.SugarLogger.Debugf("打印机连接错误:%v delete : %s", err, nowPrintNo)
// changePrinterStatus(nowPrintNo, printerStatusOffline)
// delete(PrintObject, nowPrintNo)
//}
return err return err
} }
@@ -94,13 +88,8 @@ func handleConn(c net.Conn) error {
_, printNo = getCallbackMsgInfo(data) _, printNo = getCallbackMsgInfo(data)
callback = true callback = true
} }
//nowPrintNo = printNo
t, ok := PrintObject[printNo] t, ok := PrintObject[printNo]
if printNo == "120220915001467" {
globals.SugarLogger.Debugf("=========ok : %s", utils.Format4Output(ok, false))
globals.SugarLogger.Debugf("=========okt : %s", utils.Format4Output(t, false))
}
if !ok { if !ok {
t = NewTcpClient() t = NewTcpClient()
buildAllMap(t, printNo) buildAllMap(t, printNo)
@@ -271,11 +260,13 @@ func doPrint(t *TcpClient, key string) (err error) {
printMsg.Status = printMsgErr printMsg.Status = printMsgErr
printMsg.Comment = err.Error() printMsg.Comment = err.Error()
dao.UpdateEntity(db, printMsg, "Status", "Comment") dao.UpdateEntity(db, printMsg, "Status", "Comment")
globals.SugarLogger.Debugf("=====1 %v", err)
delete(t.TimeoutMap, key) delete(t.TimeoutMap, key)
return return
} }
if _, err = c.Write(data); err != nil { if _, err = c.Write(data); err != nil {
globals.SugarLogger.Debugf("=====2 %v", err)
globals.SugarLogger.Debugf("handleTcpMessages err [%v]", err) globals.SugarLogger.Debugf("handleTcpMessages err [%v]", err)
//close(t.TimeoutMap[key]) //close(t.TimeoutMap[key])
delete(t.TimeoutMap, key) delete(t.TimeoutMap, key)
@@ -436,7 +427,6 @@ func HandleCheckTcpHeart(t *TcpClient, key string) {
if time.Now().Sub(statusTime) > time.Second*75 { if time.Now().Sub(statusTime) > time.Second*75 {
globals.SugarLogger.Debugf("超过一分十秒没有心跳的打印机[%s],当前心跳时间: %s ,上一次心跳时间 : %s", key, utils.Time2TimeStr(time.Now()), utils.Time2TimeStr(statusTime)) globals.SugarLogger.Debugf("超过一分十秒没有心跳的打印机[%s],当前心跳时间: %s ,上一次心跳时间 : %s", key, utils.Time2TimeStr(time.Now()), utils.Time2TimeStr(statusTime))
changePrinterStatus(key, printerStatusOffline) changePrinterStatus(key, printerStatusOffline)
delete(t.TimeoutMap, key)
delete(PrintObject, key) delete(PrintObject, key)
} }
} }