打印机

This commit is contained in:
邹宗楠
2022-08-03 09:04:28 +08:00
parent 3ede3efd61
commit e552efc2ad
20 changed files with 435 additions and 22 deletions

View File

@@ -3,8 +3,9 @@ package app
import (
"git.rosy.net.cn/jx-print/controllers"
"git.rosy.net.cn/jx-print/model"
print "git.rosy.net.cn/jx-print/model/app_model"
printModel "git.rosy.net.cn/jx-print/model/app_model"
"git.rosy.net.cn/jx-print/putils"
print "git.rosy.net.cn/jx-print/services/print_server"
printServer "git.rosy.net.cn/jx-print/services/print_server/app_server"
"github.com/gin-gonic/gin"
)
@@ -25,8 +26,9 @@ func (p *Print) AddPrinters(c *gin.Context) {
var (
err error
tokenInfo *model.TokenInfo
param = print.AddPrintReq{}
param = printModel.AddPrintReq{}
printInfo []*model.PrintInfo
setting = printServer.PrintSettingInfoServer
)
if err = c.ShouldBind(&param); err != nil {
@@ -42,8 +44,15 @@ func (p *Print) AddPrinters(c *gin.Context) {
}
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = printServer.AddPrinters(tokenInfo, param.AppID, printInfo)
return retVal, "", err
// 添加打印机
if err := printServer.AddPrinters(tokenInfo, param.AppID, printInfo); err != nil {
return nil, "", err
}
// 赋予默认配置
if err := setting.SystemInitPrintSetting(printInfo[0].PrintNo); err != nil {
return nil, "", err
}
return "", "", nil
})
}
@@ -60,7 +69,7 @@ func (p *Print) GetPrinters(c *gin.Context) {
var (
err error
tokenInfo *model.TokenInfo
param = print.QueryPrintReq{}
param = printModel.QueryPrintReq{}
)
if err = c.ShouldBind(&param); err != nil {
controllers.BuildErrJson(c, err)
@@ -86,10 +95,12 @@ func (p *Print) GetPrinters(c *gin.Context) {
// @router /delPrinters [post]
func (p *Print) DelPrinters(c *gin.Context) {
var (
err error
tokenInfo *model.TokenInfo
param = print.DeletePrintReq{}
printNos []string
err error
tokenInfo *model.TokenInfo
param = printModel.DeletePrintReq{}
printNos []string
tempServer = printServer.TempServer{}
settingServer = printServer.PrintSettingServer{}
)
if err = c.ShouldBind(&param); err != nil {
controllers.BuildErrJson(c, err)
@@ -103,7 +114,16 @@ func (p *Print) DelPrinters(c *gin.Context) {
return
}
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = printServer.DelPrinters(param.AppID, tokenInfo, printNos)
// 删除打印机
if err := printServer.DelPrinters(param.AppID, tokenInfo, printNos); err != nil {
return nil, "", err
}
// 删除模板
err = tempServer.DeleteAllTemp(tokenInfo.User.UserID, printNos)
// 删除设置
err = settingServer.DeletePrintSetting(printNos)
// 删除打印消息
err = print.DeletePrintMsg(printNos)
return retVal, "", err
})
}
@@ -120,7 +140,7 @@ func (p *Print) UpdatePrinter(c *gin.Context) {
var (
err error
tokenInfo *model.TokenInfo
param = print.UpdatePrintReq{}
param = printModel.UpdatePrintReq{}
)
if err = c.ShouldBind(&param); err != nil {
controllers.BuildErrJson(c, err)
@@ -150,7 +170,7 @@ func (p *Print) TestPrint(c *gin.Context) {
var (
err error
tokenInfo *model.TokenInfo
param = print.TestPrintReq{}
param = printModel.TestPrintReq{}
)
if err = c.ShouldBind(&param); err != nil {
controllers.BuildErrJson(c, err)
@@ -177,7 +197,7 @@ func (p *Print) GetPrintMessages(c *gin.Context) {
var (
err error
tokenInfo *model.TokenInfo
param = print.GetPrintMsg{}
param = printModel.GetPrintMsg{}
)
if err = c.ShouldBind(&param); err != nil {
controllers.BuildErrJson(c, err)