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,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
})