This commit is contained in:
苏尹岚
2021-02-01 14:40:33 +08:00
parent 2e59fe535b
commit 786a0cadf4
6 changed files with 34 additions and 18 deletions

View File

@@ -2,7 +2,7 @@ package controllers
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/business/jxstore/permission"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"github.com/astaxie/beego"
@@ -23,7 +23,7 @@ func (c *PowerController) AddMenu() {
c.callAddMenu(func(params *tPowerAddMenuParams) (retVal interface{}, errCode string, err error) {
menu := &model.Menu{}
if err = utils.UnmarshalUseNumber([]byte(params.Payload), menu); err == nil {
err = cms.AddMenu(params.Ctx, menu)
err = permission.AddMenu(params.Ctx, menu)
}
return retVal, "", err
})
@@ -38,7 +38,7 @@ func (c *PowerController) AddMenu() {
// @router /GetMenu [get]
func (c *PowerController) GetMenu() {
c.callGetMenu(func(params *tPowerGetMenuParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetMenu(params.Ctx, params.UserID)
retVal, err = permission.GetMenu(params.Ctx, params.UserID)
return retVal, "", err
})
}
@@ -56,7 +56,7 @@ func (c *PowerController) UpdateMenu() {
c.callUpdateMenu(func(params *tPowerUpdateMenuParams) (retVal interface{}, errCode string, err error) {
payload := make(map[string]interface{})
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &payload); err == nil {
retVal, err = cms.UpdateMenu(params.Ctx, params.MenuID, payload, params.IsDelete)
retVal, err = permission.UpdateMenu(params.Ctx, params.MenuID, payload, params.IsDelete)
}
return retVal, "", err
})
@@ -71,7 +71,7 @@ func (c *PowerController) UpdateMenu() {
// @router /AddRole [post]
func (c *PowerController) AddRole() {
c.callAddRole(func(params *tPowerAddRoleParams) (retVal interface{}, errCode string, err error) {
err = cms.AddRole(params.Ctx, params.Name)
err = permission.AddRole(params.Ctx, params.Name)
return retVal, "", err
})
}
@@ -85,7 +85,7 @@ func (c *PowerController) AddRole() {
// @router /GetRole [get]
func (c *PowerController) GetRole() {
c.callGetRole(func(params *tPowerGetRoleParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetRole(params.Ctx, params.Name)
retVal, err = permission.GetRole(params.Ctx, params.Name)
return retVal, "", err
})
}
@@ -108,7 +108,7 @@ func (c *PowerController) UpdateRole() {
cityCodes, storeIDs []int
)
if err = jxutils.Strings2Objs(params.CityCodes, &cityCodes, params.StoreIDs, &storeIDs); err == nil {
retVal, err = cms.UpdateRole(params.Ctx, params.RoleID, params.Name, params.IsDelete, params.BrandID, cityCodes, storeIDs)
retVal, err = permission.UpdateRole(params.Ctx, params.RoleID, params.Name, params.IsDelete, params.BrandID, cityCodes, storeIDs)
}
return retVal, "", err
})
@@ -123,7 +123,7 @@ func (c *PowerController) UpdateRole() {
// @router /GetUserRole [get]
func (c *PowerController) GetUserRole() {
c.callGetUserRole(func(params *tPowerGetUserRoleParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetUserRole(params.Ctx, params.UserID)
retVal, err = permission.GetUserRole(params.Ctx, params.UserID)
return retVal, "", err
})
}
@@ -143,7 +143,7 @@ func (c *PowerController) UpdateUserRole() {
roleIDs []int
)
if err = jxutils.Strings2Objs(params.UserIDs, &userIDs, params.RoleIDs, &roleIDs); err == nil {
err = cms.UpdateUserRole(params.Ctx, userIDs, roleIDs)
err = permission.UpdateUserRole(params.Ctx, userIDs, roleIDs)
}
return retVal, "", err
})
@@ -158,7 +158,7 @@ func (c *PowerController) UpdateUserRole() {
// @router /GetRoleMenu [get]
func (c *PowerController) GetRoleMenu() {
c.callGetRoleMenu(func(params *tPowerGetRoleMenuParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetRoleMenu(params.Ctx, params.RoleID)
retVal, err = permission.GetRoleMenu(params.Ctx, params.RoleID)
return retVal, "", err
})
}
@@ -177,7 +177,7 @@ func (c *PowerController) UpdateRoleMenu() {
roleIDs, menuIDs []int
)
if err = jxutils.Strings2Objs(params.RoleIDs, &roleIDs, params.MenuIDs, &menuIDs); err == nil {
err = cms.UpdateRoleMenu(params.Ctx, roleIDs, menuIDs)
err = permission.UpdateRoleMenu(params.Ctx, roleIDs, menuIDs)
}
return retVal, "", err
})