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

aa

Browse Source
This commit is contained in:
suyl
2021-10-19 18:19:58 +08:00
parent 175b81d0fd
commit aa2a2d4668
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,7 +180,9 @@ func (t *TcpClient) HandleTcpMessages(printNo string) {
printMsg.Status = printMsgAlreadyLoad printMsg.Status = printMsgAlreadyLoad
//先避免重复读再插到channel？ //先避免重复读再插到channel？
if _, err := dao.UpdateEntity(db, printMsg, "Status"); err == nil { if _, err := dao.UpdateEntity(db, printMsg, "Status"); err == nil {
t.addMsgChan(printMsg) if err = t.addMsgChan(printMsg); err != nil {
globals.SugarLogger.Debugf("HandleTcpMessages addMsgChan Err: %v", err)
}
} }
} }
} }

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

@@ -259,15 +259,21 @@ func (t *TcpClient) setPrintStatusTime(key string) {
} }
} }
func (t *TcpClient) addMsgChan(printMsg *model.PrintMsg) { func (t *TcpClient) addMsgChan(printMsg *model.PrintMsg) (err error) {
t.Lock() t.Lock()
defer t.Unlock() defer func() {
t.Unlock()
if r := recover(); r != nil && r.(error).Error() == "send on closed channel" {
err = fmt.Errorf("send on closed channel")
}
}()
if t.MsgMap[printMsg.PrintNo] == nil { if t.MsgMap[printMsg.PrintNo] == nil {
dataChan := make(chan *model.PrintMsg, 1024) dataChan := make(chan *model.PrintMsg, 1024)
t.MsgMap[printMsg.PrintNo] = dataChan t.MsgMap[printMsg.PrintNo] = dataChan
} }
globals.SugarLogger.Debugf("addMsgChan msgID: %s", printMsg.MsgID) globals.SugarLogger.Debugf("addMsgChan msgID: %s", printMsg.MsgID)
t.MsgMap[printMsg.PrintNo] <- printMsg t.MsgMap[printMsg.PrintNo] <- printMsg
return err
} }
func (t *TcpClient) addCallbackChan(key, data string) { func (t *TcpClient) addCallbackChan(key, data string) {