From 5d767819656e6c95f7a8a6aef9d9dd8058dc3a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 24 Dec 2025 16:13:32 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/api_print.go | 2 +- business/model/dao/dao_print.go | 2 +- controllers/api_controller.go | 33 +++++++++---------------------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/business/jxstore/cms/api_print.go b/business/jxstore/cms/api_print.go index 550daa4e9..a3ece0c3e 100644 --- a/business/jxstore/cms/api_print.go +++ b/business/jxstore/cms/api_print.go @@ -268,7 +268,7 @@ func DelPrinter(appID int, printNos []string, storeId string) (err error) { return err } -func QueryPrintList(printNo, printKey string, status, isOnline int, page, size int) ([]*model.Printer, int, error) { +func QueryPrintList(printNo, printKey string, status, isOnline int64, page, size int64) ([]*model.Printer, int, error) { prints, count, err := dao.QueryPrintList(dao.GetDB(), printNo, printKey, status, isOnline, page, size) return prints, count, err } diff --git a/business/model/dao/dao_print.go b/business/model/dao/dao_print.go index 3960c30ad..7f42ef651 100644 --- a/business/model/dao/dao_print.go +++ b/business/model/dao/dao_print.go @@ -125,7 +125,7 @@ func DeletePrintMsg() { return } -func QueryPrintList(db *DaoDB, printNo, printKey string, status, isOnline int, page, size int) (print []*model.Printer, count int, err error) { +func QueryPrintList(db *DaoDB, printNo, printKey string, status, isOnline int64, page, size int64) (print []*model.Printer, count int, err error) { sql := ` SELECT * FROM printer WHERE 1=1 ` diff --git a/controllers/api_controller.go b/controllers/api_controller.go index 6463abe1c..834614145 100644 --- a/controllers/api_controller.go +++ b/controllers/api_controller.go @@ -225,10 +225,10 @@ func (c *ApiController) QueryPrintList(dataMap map[string]interface{}) (data map var ( printNo string printKey string - status int - isOnline int - page int - size int + status int64 + isOnline int64 + page int64 + size int64 ) globals.SugarLogger.Debugf("-----dataMap := %s", utils.Format4Output(dataMap, false)) @@ -242,26 +242,11 @@ func (c *ApiController) QueryPrintList(dataMap map[string]interface{}) (data map } else { printKey = key } - if s, ok := dataMap["status"].(int); !ok { - status = model.PrintMsgAll - } else { - status = s - } - if online, ok := dataMap["is_online"].(int); !ok { - isOnline = model.PrintMsgAll - } else { - isOnline = online - } - if p, ok := dataMap["page"].(int); !ok { - page = 0 - } else { - page = p - } - if s, ok := dataMap["size"].(int); !ok { - size = 20 - } else { - size = s - } + + status = utils.Interface2Int64WithDefault(dataMap["status"], -9) + isOnline = utils.Interface2Int64WithDefault(dataMap["is_online"], -9) + page = utils.Interface2Int64WithDefault(dataMap["page"], 0) + size = utils.Interface2Int64WithDefault(dataMap["size"], 15) list, count, err := cms.QueryPrintList(printNo, printKey, status, isOnline, page, size) data = map[string]interface{}{