This commit is contained in:
suyl
2021-07-21 18:19:14 +08:00
parent a6b1a43a86
commit 6d6fc074ad

View File

@@ -109,6 +109,9 @@ var (
regexpQrl = regexp.MustCompile(byteSignQrLeft + "(.*?)" + byteSignQrLeftE) regexpQrl = regexp.MustCompile(byteSignQrLeft + "(.*?)" + byteSignQrLeftE)
regexpQrr = regexp.MustCompile(byteSignQrRight + "(.*?)" + byteSignQrRightE) regexpQrr = regexp.MustCompile(byteSignQrRight + "(.*?)" + byteSignQrRightE)
regexpSound = regexp.MustCompile(byteSignSound + "(.*?)" + byteSignSoundE) regexpSound = regexp.MustCompile(byteSignSound + "(.*?)" + byteSignSoundE)
printMsgChan = make(chan *model.PrintMsg)
printMsgChanFail = make(chan *model.PrintMsg)
) )
type PrintInfo struct { type PrintInfo struct {
@@ -259,6 +262,17 @@ func printFail() (err error) {
) )
prints, _ := dao.GetPrintMsgs(db, []int{printMsgWait, printMsgFail, printMsgErr}, time.Now().Add(-time.Hour*3), time.Now(), 0, 999) prints, _ := dao.GetPrintMsgs(db, []int{printMsgWait, printMsgFail, printMsgErr}, time.Now().Add(-time.Hour*3), time.Now(), 0, 999)
for _, printMsg := range prints { for _, printMsg := range prints {
printMsgChanFail <- printMsg
}
return err
}
func doPrint(printMsgChanFail chan *model.PrintMsg) (err error) {
var (
db = dao.GetDB()
)
for {
printMsg := <-printMsgChanFail
var ( var (
data []byte data []byte
c net.Conn c net.Conn
@@ -289,7 +303,6 @@ func printFail() (err error) {
} }
} }
} }
return err
} }
func printStatus2JxStatus(printStatus string) (status int) { func printStatus2JxStatus(printStatus string) (status int) {
@@ -346,10 +359,20 @@ func HandleTcpMessages() {
) )
for { for {
//一直读? //一直读?
var err error
time.Sleep(time.Second / 2) time.Sleep(time.Second / 2)
prints, _ := dao.GetPrintMsgs(db, []int{printMsgWait}, time.Now().Add(-time.Hour*3), time.Now(), offset, pageSize) prints, _ := dao.GetPrintMsgs(db, []int{printMsgWait}, time.Now().Add(-time.Hour*3), time.Now(), offset, pageSize)
for _, printMsg := range prints { for _, printMsg := range prints {
printMsgChan <- printMsg
}
}
}
func doPrint2(printMsgChan chan *model.PrintMsg) (err error) {
var (
db = dao.GetDB()
)
for {
printMsg := <-printMsgChan
var ( var (
data []byte data []byte
c net.Conn c net.Conn
@@ -396,7 +419,6 @@ func HandleTcpMessages() {
} }
} }
} }
}
} }
func HandleCheckTcpHeart() { func HandleCheckTcpHeart() {