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

1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

24
controllers/app/print_temp.go
View File

@@ -1,7 +1,7 @@
package app
import (
"git.rosy.net.cn/jx-print/controllers/controller"
"git.rosy.net.cn/jx-print/controllers"
"git.rosy.net.cn/jx-print/model"
tempModel "git.rosy.net.cn/jx-print/model/app_model"
printServer "git.rosy.net.cn/jx-print/services/print_server/app_server"
@@ -24,15 +24,15 @@ func (p *Print) AddOrUpdateTemp(c *gin.Context) {
tempServer = printServer.TempServer{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
param.UserId = tokenInfo.User.UserID
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = tempServer.AddOrUpdateTemp(&param)
return retVal, "", err
})
@@ -54,13 +54,13 @@ func (p *Print) DeleteTemp(c *gin.Context) {
tempServer = printServer.TempServer{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = tempServer.DeleteTemp(param.ID, tokenInfo.User.UserID)
return "", "", err
})
@@ -82,13 +82,13 @@ func (p *Print) GetUserTempList(c *gin.Context) {
tempServer = printServer.TempServer{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = tempServer.QueryTempList(tokenInfo.User.UserID)
return retVal, "", err
})
@@ -110,10 +110,10 @@ func (p *Print) SwitchTemp(c *gin.Context) {
tempServer = printServer.TempServer{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = tempServer.SwitchTemp(tokenInfo.User.UserID, param.ID)
return "", "", err
})

8
controllers/app/wx_login.go
View File

@@ -1,7 +1,7 @@
package app
import (
"git.rosy.net.cn/jx-print/controllers/controller"
"git.rosy.net.cn/jx-print/controllers"
"git.rosy.net.cn/jx-print/model"
"git.rosy.net.cn/jx-print/model/app_model"
"git.rosy.net.cn/jx-print/services/print_server/app_server"
@@ -36,13 +36,13 @@ func (a *Auth2Controller) Login(c *gin.Context) {
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
user, err := service.WxLogin(c, params.Code, params.Phone)
if err != nil {
return nil, "", err
}
// 获取token
token, err := controller.SetToken(user)
token, err := controllers.SetToken(user)
if err != nil {
return nil, "", err
}
@@ -74,7 +74,7 @@ func (a *Auth2Controller) GetUserPhoneByWeChat(c *gin.Context) {
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
phone, err := service.GetUserPhoneNum(params)
if err != nil {
return nil, "", err

46
controllers/app/wx_print.go
View File

@@ -1,7 +1,7 @@
package app
import (
"git.rosy.net.cn/jx-print/controllers/controller"
"git.rosy.net.cn/jx-print/controllers"
"git.rosy.net.cn/jx-print/model"
print "git.rosy.net.cn/jx-print/model/app_model"
"git.rosy.net.cn/jx-print/putils"
@@ -30,18 +30,18 @@ func (p *Print) AddPrinters(c *gin.Context) {
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
if err = putils.UnmarshalUseNumber([]byte(param.Prints), &printInfo); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = printServer.AddPrinters(tokenInfo, param.AppID, printInfo)
return retVal, "", err
})
@@ -63,14 +63,14 @@ func (p *Print) GetPrinters(c *gin.Context) {
param = print.QueryPrintReq{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = printServer.GetPrinters(param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize, tokenInfo.User.UserID)
return retVal, "", err
})
@@ -92,17 +92,17 @@ func (p *Print) DelPrinters(c *gin.Context) {
printNos []string
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
if err = putils.UnmarshalUseNumber([]byte(param.PrintNos), &printNos); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = printServer.DelPrinters(param.AppID, tokenInfo, printNos)
return retVal, "", err
})
@@ -123,13 +123,13 @@ func (p *Print) UpdatePrinter(c *gin.Context) {
param = print.UpdatePrintReq{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
err = printServer.UpdatePrinter(param.AppID, tokenInfo, param.PrintNo, param.Name, param.Sound, param.Volume)
return retVal, "", err
}) {
@@ -153,13 +153,13 @@ func (p *Print) TestPrint(c *gin.Context) {
param = print.TestPrintReq{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = printServer.TestPrint(param.AppID, tokenInfo, param.PrintNo, param.OrderNo, param.Content)
return retVal, "", err
})
@@ -180,14 +180,14 @@ func (p *Print) GetPrintMessages(c *gin.Context) {
param = print.GetPrintMsg{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
controllers.BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = printServer.GetPrintMessages(param.AppID, tokenInfo, param.PrintNo, param.MsgID, param.BeginAt, param.EndAt, param.Offset, param.PageSize)
return retVal, "", err
})
@@ -198,10 +198,10 @@ func (p *Print) StatPrinterReport(c *gin.Context) {
var (
tokenInfo *model.TokenInfo
)
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return
}
controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = printServer.GetPrinterReport(tokenInfo)
return retVal, "", err
})