From 0e3f610d778986acf92ab8d6baa2693e44a02cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 29 Jul 2022 09:26:22 +0800
Subject: [PATCH] 1

---
 dao/print_dao.go   | 20 ++++++++++----------
 globals/globals.go | 16 ++++++++++------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/dao/print_dao.go b/dao/print_dao.go
index 527be93..13b5472 100644
--- a/dao/print_dao.go
+++ b/dao/print_dao.go
@@ -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) {
-	sqlCount := `SELECT COUNT(id) count `
-	//
-	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 `
-	sqlOther := ` FROM printer WHERE 1 = 1 AND deleted_at = ?`
+	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  p.*`
+	sqlOther := ` FROM printer p WHERE 1 = 1 AND p.deleted_at = ?`
 	sqlParams := []interface{}{utils.DefaultTimeValue}
 	if appID != 0 {
-		sqlOther += " AND app_id = ?"
+		sqlOther += " AND p.app_id = ?"
 		sqlParams = append(sqlParams, appID)
 	}
 	if printNo != "" {
-		sqlOther += " AND print_no = ?"
+		sqlOther += " AND p.print_no = ?"
 		sqlParams = append(sqlParams, printNo)
 	}
 	if name != "" {
-		sqlOther += " AND name LIKE ?"
+		sqlOther += " AND p.name LIKE ?"
 		sqlParams = append(sqlParams, "%"+name+"%")
 	}
 	if status != model.StatusAll {
-		sqlOther += " AND status = ?"
+		sqlOther += " AND p.status = ?"
 		sqlParams = append(sqlParams, status)
 	}
 	if isOnline != model.StatusAll {
-		sqlOther += " AND is_online = ?"
+		sqlOther += " AND p.is_online = ?"
 		sqlParams = append(sqlParams, isOnline)
 	}
 	if userId != "" {
-		sqlOther += " AND user_id = ?"
+		sqlOther += " AND p.user_id = ?"
 		sqlParams = append(sqlParams, userId)
 	}
 	//查总数
diff --git a/globals/globals.go b/globals/globals.go
index 1f4d523..aa02e04 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -4,24 +4,28 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
 	"go.uber.org/zap"
+	"time"
 )
 
 var (
 	SugarLogger *zap.SugaredLogger
-	db *sqlx.DB
-	err error
+	db          *sqlx.DB
+	err         error
 )
 
 func init() {
 	logger, _ := zap.NewDevelopment()
 	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)
 	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
-}
\ No newline at end of file
+}