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

aa

Browse Source
This commit is contained in:
suyl
2021-07-21 10:03:53 +08:00
parent 142bd502b2
commit 5b59315547
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dao/print_dao.go
View File

@@ -7,7 +7,7 @@ import (
"time" "time"
) )
func GetPrinters(db *sqlx.DB, appID int, printNo string, status int, statusNeq int) (printers []*model.Printer, err error) { func GetPrinters(db *sqlx.DB, appID int, printNo string, status int, statusNeq int, flowFlag int) (printers []*model.Printer, err error) {
sql := ` sql := `
SELECT * SELECT *
FROM printer FROM printer
@@ -30,6 +30,10 @@ func GetPrinters(db *sqlx.DB, appID int, printNo string, status int, statusNeq i
sql += " AND status <> ?" sql += " AND status <> ?"
sqlParams = append(sqlParams, statusNeq) sqlParams = append(sqlParams, statusNeq)
} }
if flowFlag != 0 {
sql += " AND flow_flag = ?"
sqlParams = append(sqlParams, flowFlag)
}
if err = db.Select(&printers, sql, sqlParams...); err == nil { if err = db.Select(&printers, sql, sqlParams...); err == nil {
return printers, err return printers, err
} }

10
services/print.go
View File

@@ -38,7 +38,7 @@ func AddPrinters(c *gin.Context, tokenInfo *model.TokenInfo, appID int, printInf
errs = append(errs, fmt.Errorf("请输入正确的打印机编号！print_no :%s 。", v.PrintNo)) errs = append(errs, fmt.Errorf("请输入正确的打印机编号！print_no :%s 。", v.PrintNo))
continue continue
} }
printers, _ := dao.GetPrinters(db, appID, v.PrintNo, 0, 0) printers, _ := dao.GetPrinters(db, appID, v.PrintNo, 0, 0, 0)
if len(printers) > 0 { if len(printers) > 0 {
errs = append(errs, fmt.Errorf("此打印机已被其他应用绑定！print_no :%s 。", v.PrintNo)) errs = append(errs, fmt.Errorf("此打印机已被其他应用绑定！print_no :%s 。", v.PrintNo))
continue continue
@@ -88,7 +88,7 @@ func DelPrinters(c *gin.Context, appID int, tokenInfo *model.TokenInfo, printNos
errs = append(errs, fmt.Errorf("请输入正确的打印机编号！print_no :%s 。", v)) errs = append(errs, fmt.Errorf("请输入正确的打印机编号！print_no :%s 。", v))
continue continue
} }
printers, _ := dao.GetPrinters(db, appID, v, 0, 0) printers, _ := dao.GetPrinters(db, appID, v, 0, 0, 0)
if len(printers) == 0 { if len(printers) == 0 {
errs = append(errs, fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, v)) errs = append(errs, fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, v))
continue continue
@@ -116,7 +116,7 @@ func UpdatePrinter(c *gin.Context, appID int, tokenInfo *model.TokenInfo, printN
return fmt.Errorf("未查询到此应用！app_id:%d", appID) return fmt.Errorf("未查询到此应用！app_id:%d", appID)
} }
printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0) printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0)
if len(printers) == 0 { if len(printers) == 0 {
return fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo) return fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
} }
@@ -155,7 +155,7 @@ func TestPrint(c *gin.Context, appID int, tokenInfo *model.TokenInfo, printNo st
if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 { if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 {
return "", fmt.Errorf("未查询到此应用！app_id:%d", appID) return "", fmt.Errorf("未查询到此应用！app_id:%d", appID)
} }
printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0) printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0)
if len(printers) == 0 { if len(printers) == 0 {
return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo) return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
} }
@@ -180,7 +180,7 @@ func GetPrintMessages(c *gin.Context, appID int, tokenInfo *model.TokenInfo, pri
if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 { if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 {
return nil, fmt.Errorf("未查询到此应用！app_id:%d", appID) return nil, fmt.Errorf("未查询到此应用！app_id:%d", appID)
} }
printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0) printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0)
if len(printers) == 0 { if len(printers) == 0 {
return nil, fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo) return nil, fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
} }

6
services/sim.go
View File

@@ -1,6 +1,7 @@
package services package services
import ( import (
"fmt"
"git.rosy.net.cn/baseapi/platformapi/tibiotapi" "git.rosy.net.cn/baseapi/platformapi/tibiotapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/dao" "git.rosy.net.cn/jx-print/dao"
@@ -26,7 +27,8 @@ func SimFlowDaySettle() (err error) {
return return
} }
//找出所有状态不为 超流量的打印机（iccid卡） //找出所有状态不为 超流量的打印机（iccid卡）
printers, _ := dao.GetPrinters(db, 0, "", 0, model.PrinterStatusOverFlow) printers, _ := dao.GetPrinters(db, 0, "", 0, 0, 0)
fmt.Println("1111111111111111", utils.Format4Output(printers, true))
for _, v := range printers { for _, v := range printers {
//查询前一日使用的流量数 //查询前一日使用的流量数
if v.IccID != "" { if v.IccID != "" {
@@ -83,7 +85,7 @@ func SimFlowMonthSettle() {
return return
} }
//找出所有有iccid 卡的 //找出所有有iccid 卡的
printers, _ := dao.GetPrinters(db, 0, "", 0, model.PrinterStatusOverFlow) printers, _ := dao.GetPrinters(db, 0, "", 0, 0, 0)
for _, v := range printers { for _, v := range printers {
if v.IccID != "" { if v.IccID != "" {
flowIncome := &model.SimFlowIncome{ flowIncome := &model.SimFlowIncome{