This commit is contained in:
邹宗楠
2022-07-29 09:26:22 +08:00
parent 21afff20c0
commit 0e3f610d77
2 changed files with 20 additions and 16 deletions

View File

@@ -41,33 +41,33 @@ 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) {
sqlCount := `SELECT COUNT(id) count ` sqlCount := `SELECT COUNT(p.id) count `
// // id,created_at,updated_at,deleted_at,last_operator, app_id,print_no,print_key,name,status,is_online,icc_id,sound,volume,flow_flag,offline_count,user_id
sql := `SELECT id,created_at,updated_at,deleted_at,last_operator, app_id,print_no,print_key,name,status,is_online,icc_id,sound,volume,flow_flag,offline_count,user_id ` sql := `SELECT p.*`
sqlOther := ` FROM printer WHERE 1 = 1 AND deleted_at = ?` sqlOther := ` FROM printer p WHERE 1 = 1 AND p.deleted_at = ?`
sqlParams := []interface{}{utils.DefaultTimeValue} sqlParams := []interface{}{utils.DefaultTimeValue}
if appID != 0 { if appID != 0 {
sqlOther += " AND app_id = ?" sqlOther += " AND p.app_id = ?"
sqlParams = append(sqlParams, appID) sqlParams = append(sqlParams, appID)
} }
if printNo != "" { if printNo != "" {
sqlOther += " AND print_no = ?" sqlOther += " AND p.print_no = ?"
sqlParams = append(sqlParams, printNo) sqlParams = append(sqlParams, printNo)
} }
if name != "" { if name != "" {
sqlOther += " AND name LIKE ?" sqlOther += " AND p.name LIKE ?"
sqlParams = append(sqlParams, "%"+name+"%") sqlParams = append(sqlParams, "%"+name+"%")
} }
if status != model.StatusAll { if status != model.StatusAll {
sqlOther += " AND status = ?" sqlOther += " AND p.status = ?"
sqlParams = append(sqlParams, status) sqlParams = append(sqlParams, status)
} }
if isOnline != model.StatusAll { if isOnline != model.StatusAll {
sqlOther += " AND is_online = ?" sqlOther += " AND p.is_online = ?"
sqlParams = append(sqlParams, isOnline) sqlParams = append(sqlParams, isOnline)
} }
if userId != "" { if userId != "" {
sqlOther += " AND user_id = ?" sqlOther += " AND p.user_id = ?"
sqlParams = append(sqlParams, userId) sqlParams = append(sqlParams, userId)
} }
//查总数 //查总数

View File

@@ -4,24 +4,28 @@ import (
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"go.uber.org/zap" "go.uber.org/zap"
"time"
) )
var ( var (
SugarLogger *zap.SugaredLogger SugarLogger *zap.SugaredLogger
db *sqlx.DB db *sqlx.DB
err error err error
) )
func init() { func init() {
logger, _ := zap.NewDevelopment() logger, _ := zap.NewDevelopment()
SugarLogger = logger.Sugar() SugarLogger = logger.Sugar()
sqlStr :="root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true" sqlStr := "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true"
db, err = sqlx.Connect("mysql", sqlStr) db, err = sqlx.Connect("mysql", sqlStr)
if err != nil { if err != nil {
SugarLogger.Debugf("加载数据库失败err :%v",err) SugarLogger.Debugf("加载数据库失败err :%v", err)
} }
db.SetConnMaxLifetime(time.Second * 10)
db.SetMaxOpenConns(200) // 设置与数据库建立连接的最大数目
db.SetMaxIdleConns(10) // 设置连接池中的最大闲置连接数
} }
func GetDB()*sqlx.DB{ func GetDB() *sqlx.DB {
return db return db
} }