This commit is contained in:
suyl
2021-07-09 15:52:05 +08:00
parent 1441394923
commit 756b904cb2
2 changed files with 7 additions and 4 deletions

View File

@@ -292,7 +292,7 @@ func HandleTcpMessages() {
//一直读?
var err error
time.Sleep(time.Second / 2)
prints, _ := dao.GetPrintMsgs(db, printMsgWait, time.Now().Add(-time.Hour*3), time.Now(), offset, pageSize)
prints, _ := dao.GetPrintMsgs(db, []int{printMsgWait, printMsgAlreadySend}, time.Now().Add(-time.Hour*3), time.Now(), offset, pageSize)
for _, printMsg := range prints {
var (
data []byte

View File

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