refactor🎨:菜单、角色、用户模块调整

This commit is contained in:
wenjianzhang committed 2021-06-16 18:34:25 +08:00
1 parent e4ffd1df14
commit 8f637e02d0
3 files changed
+67 -45

No files matched your search

+37 -36
View File
@@ -204,42 +204,43 @@ func (e SysMenu) GetMenuRole(c *gin.Context) {
e.OK(result, "") e.OK(result, "")
} }
// GetMenuIDS 获取角色对应的菜单id数组 //// GetMenuIDS 获取角色对应的菜单id数组
// @Summary 获取角色对应的菜单id数组,设置角色权限使用 //// @Summary 获取角色对应的菜单id数组,设置角色权限使用
// @Description 获取JSON //// @Description 获取JSON
// @Tags 菜单 //// @Tags 菜单
// @Param id path int true "id" //// @Param id path int true "id"
// @Success 200 {object} response.Response "{"code": 200, "data": [...]}" //// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
// @Router /api/v1/menuids/{id} [get] //// @Router /api/v1/menuids/{id} [get]
// @Security Bearer //// @Security Bearer
func (e SysMenu) GetMenuIDS(c *gin.Context) { //func (e SysMenu) GetMenuIDS(c *gin.Context) {
s := new(service.SysMenu) // s := new(service.SysMenu)
r := service.SysRole{} // r := service.SysRole{}
m := dto.SysRoleByName{} // m := dto.SysRoleByName{}
err := e.MakeContext(c). // err := e.MakeContext(c).
MakeOrm(). // MakeOrm().
Bind(&m, binding.JSON). // Bind(&m, binding.JSON).
MakeService(&s.Service). // MakeService(&s.Service).
MakeService(&r.Service). // MakeService(&r.Service).
Errors // Errors
if err != nil { // if err != nil {
e.Logger.Error(err) // e.Logger.Error(err)
e.Error(500, err, err.Error()) // e.Error(500, err, err.Error())
return // return
} // }
r.GetWithName(&m) // var data models.SysRole
var data models.RoleMenu // err = r.GetWithName(&m, &data).Error
data.RoleName = c.GetString("role") //
data.UpdateBy = user.GetUserId(c) // //data.RoleName = c.GetString("role")
result, err := data.GetIDS(s.Orm) // //data.UpdateBy = user.GetUserId(c)
// //result, err := data.GetIDS(s.Orm)
if err != nil { //
e.Logger.Errorf("GetIDS error, %s", err.Error()) // if err != nil {
e.Error(500, err, "获取失败") // e.Logger.Errorf("GetIDS error, %s", err.Error())
return // e.Error(500, err, "获取失败")
} // return
e.OK(result, "") // }
} // e.OK(result, "")
//}
// GetMenuTreeSelect 根据角色ID查询菜单下拉树结构 // GetMenuTreeSelect 根据角色ID查询菜单下拉树结构
// @Summary 角色修改使用的菜单列表 // @Summary 角色修改使用的菜单列表
+6 -3
View File
@@ -397,8 +397,10 @@ func (e SysUser) GetProfile(c *gin.Context) {
func (e SysUser) GetInfo(c *gin.Context) { func (e SysUser) GetInfo(c *gin.Context) {
req := dto.SysUserById{} req := dto.SysUserById{}
s := service.SysUser{} s := service.SysUser{}
r := service.SysRole{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
MakeService(&r.Service).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
@@ -413,15 +415,16 @@ func (e SysUser) GetInfo(c *gin.Context) {
permissions[0] = "*:*:*" permissions[0] = "*:*:*"
var buttons = make([]string, 1) var buttons = make([]string, 1)
buttons[0] = "*:*:*" buttons[0] = "*:*:*"
RoleMenu := models.RoleMenu{} //RoleMenu := models.RoleMenu{}
RoleMenu.RoleId = user.GetRoleId(c) //RoleMenu.RoleId = user.GetRoleId(c)
var mp = make(map[string]interface{}) var mp = make(map[string]interface{})
mp["roles"] = roles mp["roles"] = roles
if user.GetRoleName(c) == "admin" || user.GetRoleName(c) == "系统管理员" { if user.GetRoleName(c) == "admin" || user.GetRoleName(c) == "系统管理员" {
mp["permissions"] = permissions mp["permissions"] = permissions
mp["buttons"] = buttons mp["buttons"] = buttons
} else { } else {
list, _ := RoleMenu.GetPermis(e.Orm) list, _ := r.GetById(user.GetRoleId(c))
mp["permissions"] = list mp["permissions"] = list
mp["buttons"] = list mp["buttons"] = list
} }
+24 -6
View File
@@ -252,24 +252,42 @@ func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
return nil return nil
} }
// Get 获取SysRole对象 // GetWithName 获取SysRole对象
func (e *SysRole) GetWithName(d *dto.SysRoleByName, model *models.SysRole) error { func (e *SysRole) GetWithName(d *dto.SysRoleByName, model *models.SysRole) *SysRole {
var err error var err error
db := e.Orm.Where("role_name = ?", d.RoleName).First(model) db := e.Orm.Where("role_name = ?", d.RoleName).First(model)
err = db.Error err = db.Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看") err = errors.New("查看对象不存在或无权查看")
e.Log.Errorf("db error:%s", err) e.Log.Errorf("db error:%s", err)
return err _ = e.AddError(err)
return e
} }
if err != nil { if err != nil {
e.Log.Errorf("db error:%s", err) e.Log.Errorf("db error:%s", err)
return err _ = e.AddError(err)
return e
} }
model.MenuIds, err = e.GetRoleMenuId(model.RoleId) model.MenuIds, err = e.GetRoleMenuId(model.RoleId)
if err != nil { if err != nil {
e.Log.Errorf("get menuIds error, %s", err.Error()) e.Log.Errorf("get menuIds error, %s", err.Error())
return err _ = e.AddError(err)
return e
} }
return nil return e
}
// GetById 获取SysRole对象
func (e *SysRole) GetById(roleId int) ([]string, error) {
permissions := make([]string, 0)
model := models.SysRole{}
model.RoleId = roleId
if err := e.Orm.Model(&model).Preload("SysMenu").First(&model).Error; err != nil {
return nil, err
}
l := *model.SysMenu
for i := 0; i < len(l); i++ {
permissions = append(permissions, l[i].Permission)
}
return permissions, nil
} }