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

1

Browse Source
This commit is contained in:
邹宗楠
2022-07-29 15:06:25 +08:00
parent f21b009c4e
commit 1959df5c7d
2 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/app/wx_print.go
View File

@@ -71,7 +71,7 @@ func (p *Print) GetPrinters(c *gin.Context) {
} }
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) { controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = printServer.GetPrinters(param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize, tokenInfo.User.UserID) retVal, err = printServer.GetPrinters(param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize, "")
return retVal, "", err return retVal, "", err
}) })
} }

89
dao/print_dao.go
View File

@@ -1,9 +1,7 @@
package dao package dao
import ( import (
"fmt"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/globals"
"git.rosy.net.cn/jx-print/model" "git.rosy.net.cn/jx-print/model"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"time" "time"
@@ -43,52 +41,49 @@ func GetPrinters(db *sqlx.DB, appID int, printNo string, status, statusNeq, flow
} }
func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PagedInfo, err error) { func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PagedInfo, err error) {
fmt.Println("print======================================") sqlCount := `SELECT COUNT(id) count `
globals.SugarLogger.Debug("print=============", "========") sql := `SELECT * `
//sqlCount := `SELECT COUNT(id) count ` sqlOther := ` FROM printer WHERE 1 = 1 AND deleted_at = ?`
//sql := `SELECT * ` sqlParams := []interface{}{utils.DefaultTimeValue}
//sqlOther := ` FROM printer WHERE 1 = 1 AND deleted_at = ?` if appID != 0 {
//sqlParams := []interface{}{utils.DefaultTimeValue} sqlOther += " AND app_id = ?"
//if appID != 0 { sqlParams = append(sqlParams, appID)
// sqlOther += " AND app_id = ?" }
// sqlParams = append(sqlParams, appID) if printNo != "" {
//} sqlOther += " AND print_no = ?"
//if printNo != "" { sqlParams = append(sqlParams, printNo)
// sqlOther += " AND print_no = ?" }
// sqlParams = append(sqlParams, printNo) if name != "" {
//} sqlOther += " AND name LIKE ?"
//if name != "" { sqlParams = append(sqlParams, "%"+name+"%")
// sqlOther += " AND name LIKE ?" }
// sqlParams = append(sqlParams, "%"+name+"%") if status != model.StatusAll {
//} sqlOther += " AND status = ?"
//if status != model.StatusAll { sqlParams = append(sqlParams, status)
// sqlOther += " AND status = ?" }
// sqlParams = append(sqlParams, status) if isOnline != model.StatusAll {
//} sqlOther += " AND is_online = ?"
//if isOnline != model.StatusAll { sqlParams = append(sqlParams, isOnline)
// sqlOther += " AND is_online = ?" }
// sqlParams = append(sqlParams, isOnline) if userId != "" {
//} sqlOther += " AND user_id = ?"
//if userId != "" { sqlParams = append(sqlParams, userId)
// sqlOther += " AND user_id = ?" }
// sqlParams = append(sqlParams, userId) //查总数
//} count := 0
////查总数 row := db.DB.QueryRow(sqlCount+sqlOther, sqlParams...)
//count := 0 if err = row.Scan(&count); err != nil {
//row := db.DB.QueryRow(sqlCount+sqlOther, sqlParams...) return page, err
//if err = row.Scan(&count); err != nil { }
// return page, err sqlOther += " LIMIT ? OFFSET ?"
//} sqlParams = append(sqlParams, pageSize, offset)
//sqlOther += " LIMIT ? OFFSET ?"
//sqlParams = append(sqlParams, pageSize, offset) var printers []model.Printer
// if err = db.Select(&printers, sql+sqlOther, sqlParams...); err != nil {
//var printers []model.Printer
//if err = db.Select(&printers, sql+sqlOther, sqlParams...); err != nil {
// return nil, err
//}
//
//return &model.PagedInfo{TotalCount: count, Data: printers}, err
return nil, err return nil, err
}
return &model.PagedInfo{TotalCount: count, Data: printers}, err
} }
func GetPrintMessagesPage(db *sqlx.DB, printNo, msgID, beginAt, endAt string, offset, pageSize int) (page *model.PagedInfo, err error) { func GetPrintMessagesPage(db *sqlx.DB, printNo, msgID, beginAt, endAt string, offset, pageSize int) (page *model.PagedInfo, err error) {