This commit is contained in:
邹宗楠
2022-07-26 17:37:13 +08:00
parent d038f31e87
commit f4f6bbd80b
13 changed files with 123 additions and 121 deletions

View File

@@ -1,7 +1,6 @@
package controllers
import (
"git.rosy.net.cn/jx-print/controllers/controller"
"git.rosy.net.cn/jx-print/model"
"git.rosy.net.cn/jx-print/putils"
"git.rosy.net.cn/jx-print/services/print_server"
@@ -20,17 +19,17 @@ func AddPrinters(c *gin.Context) {
printInfos []*model.PrintInfo
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = CheckToken(c); tokenInfo == nil {
return
}
if err = putils.UnmarshalUseNumber([]byte(param.Prints), &printInfos); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = print_server.AddPrinters(c, tokenInfo, param.AppID, printInfos)
return retVal, "", err
}) {
@@ -55,13 +54,13 @@ func GetPrinters(c *gin.Context) {
}{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = CheckToken(c); tokenInfo == nil {
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = print_server.GetPrinters(c, param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize)
return retVal, "", err
}) {
@@ -82,17 +81,17 @@ func DelPrinters(c *gin.Context) {
printNos []string
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = CheckToken(c); tokenInfo == nil {
return
}
if err = putils.UnmarshalUseNumber([]byte(param.PrintNos), &printNos); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = print_server.DelPrinters(c, param.AppID, tokenInfo, printNos)
return retVal, "", err
}) {
@@ -115,13 +114,13 @@ func UpdatePrinter(c *gin.Context) {
}{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = CheckToken(c); tokenInfo == nil {
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = print_server.UpdatePrinter(c, param.AppID, tokenInfo, param.PrintNo, param.Name, param.Sound, param.Volume)
return retVal, "", err
}) {
@@ -138,18 +137,18 @@ func TestPrint(c *gin.Context) {
param = &struct {
AppID int `json:"app_id" form:"app_id" binding:"required"`
PrintNo string `json:"print_no" form:"print_no" binding:"required"` //打印机编号
OrderNo int `json:"order_no" form:"order_no" binding:"required"` //订单序号
OrderNo string `json:"order_no" form:"order_no" binding:"required"` //订单序号
Content string `json:"content" form:"content"` //打印内容
}{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = CheckToken(c); tokenInfo == nil {
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = print_server.TestPrint(c, param.AppID, tokenInfo, param.PrintNo, param.OrderNo, param.Content)
return retVal, "", err
}) {
@@ -174,13 +173,13 @@ func GetPrintMessages(c *gin.Context) {
}{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = CheckToken(c); tokenInfo == nil {
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = print_server.GetPrintMessages(c, param.AppID, tokenInfo, param.PrintNo, param.MsgID, param.BeginAt, param.EndAt, param.Offset, param.PageSize)
return retVal, "", err
}) {
@@ -194,10 +193,10 @@ func GetPrinterReport(c *gin.Context) {
var (
tokenInfo *model.TokenInfo
)
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = CheckToken(c); tokenInfo == nil {
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = print_server.GetPrinterReport(c, tokenInfo)
return retVal, "", err
}) {