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-07-30 17:56:24 +08:00
parent 948cabcf52
commit 7bc76205eb
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ func ListenTcp() {
return return
} }
globals.SugarLogger.Debugf("begin listenTcp port 8000......") globals.SugarLogger.Debugf("begin listenTcp port 8000......")
go t.HandleTcpMessages() //go t.HandleTcpMessages()
go t.HandleCheckTcpHeart() go t.HandleCheckTcpHeart()
//go t.doPrint2() //go t.doPrint2()
//go t.doPrint(printMsgChanFail) //go t.doPrint(printMsgChanFail)
@@ -96,6 +96,7 @@ func (t *TcpClient) handleConn(c net.Conn) {
t.addConn(c, printNo, status) t.addConn(c, printNo, status)
//t.buildCallBackMap(printNo) //t.buildCallBackMap(printNo)
//t.buildMsgMap(printNo) //t.buildMsgMap(printNo)
t.HandleTcpMessages(printNo)
go t.doPrint2(printNo) go t.doPrint2(printNo)
changePrinterStatus(printNo, status) changePrinterStatus(printNo, status)
if status == printerStatusOnline { if status == printerStatusOnline {
@@ -217,20 +218,22 @@ func (t *TcpClient) changePrintMsg(data string, orderNo int64, printNo string) (
return err return err
} }
func (t *TcpClient) HandleTcpMessages() { func (t *TcpClient) HandleTcpMessages(printNo string) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
offset, pageSize = 0, 1 offset, pageSize = 0, 1
) )
for { go func(key string) {
//一直读？ for {
prints, _ := dao.GetPrintMsgs(db, []int{printMsgWait}, time.Now().Add(-time.Hour*3), time.Now(), offset, pageSize) //一直读？
for _, printMsg := range prints { prints, _ := dao.GetPrintMsgs(db, printNo, []int{printMsgWait}, time.Now().Add(-time.Hour*3), time.Now(), offset, pageSize)
t.addMsgChan(printMsg) for _, printMsg := range prints {
printMsg.Status = printMsgAlreadyLoad t.addMsgChan(printMsg)
dao.UpdateEntity(db, printMsg, "Status") printMsg.Status = printMsgAlreadyLoad
dao.UpdateEntity(db, printMsg, "Status")
}
} }
} }(printNo)
} }
func (t *TcpClient) doPrint2(key string) (err error) { func (t *TcpClient) doPrint2(key string) (err error) {

6
business/model/dao/dao_print.go
View File

@@ -25,13 +25,17 @@ func GetPrintMsgNoPage(db *DaoDB, printNo string, orderNo int64) (prints []*mode
return prints, err return prints, err
} }
func GetPrintMsgs(db *DaoDB, statuss []int, beginAt, endAt time.Time, offset, pageSize int) (prints []*model.PrintMsg, err error) { func GetPrintMsgs(db *DaoDB, printNo string, statuss []int, beginAt, endAt time.Time, offset, pageSize int) (prints []*model.PrintMsg, err error) {
sql := ` sql := `
SELECT a.* SELECT a.*
FROM print_msg a FROM print_msg a
WHERE 1 = 1 AND a.deleted_at = ? WHERE 1 = 1 AND a.deleted_at = ?
` `
sqlParams := []interface{}{utils.DefaultTimeValue} sqlParams := []interface{}{utils.DefaultTimeValue}
if printNo != "" {
sql += " AND a.print_no = ?"
sqlParams = append(sqlParams, printNo)
}
if len(statuss) > 0 { if len(statuss) > 0 {
sql += " AND a.status IN(" + GenQuestionMarks(len(statuss)) + ")" sql += " AND a.status IN(" + GenQuestionMarks(len(statuss)) + ")"
sqlParams = append(sqlParams, statuss) sqlParams = append(sqlParams, statuss)