estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: menu relation transformation completed

Browse Source
This commit is contained in:
QM303176530
2020-04-05 20:14:15 +08:00
parent c755120c8d
commit 81a54b5a44
11 changed files with 110 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/model/sys_authority.go
View File

@@ -30,7 +30,7 @@ func (a *SysAuthority) DeleteAuthority() (err error) {
if err != nil {
err = global.GVA_DB.Where("parent_id = ?", a.AuthorityId).Find(&SysAuthority{}).Error
if err != nil {
err = global.GVA_DB.Where("authority_id = ?", a.AuthorityId).First(a).Unscoped().Delete(a).Error
err = global.GVA_DB.Preload("SysBaseMenus").Where("authority_id = ?", a.AuthorityId).First(a).Unscoped().Delete(a).Association("SysBaseMenus").Delete(a.SysBaseMenus).Error
new(CasbinModel).clearCasbin(0, a.AuthorityId)
} else {
err = errors.New("此角色存在子角色不允许删除")

34
server/model/sys_authority_menu.go
View File

@@ -1,32 +1,19 @@
package model
import (
"fmt"
"gin-vue-admin/global"
)
// menu需要构建的点有点多 这里关联关系表直接把所有数据拿过来 用代码实现关联 后期实现主外键模式
type SysMenu struct {
SysBaseMenu
MenuId string `json:"menuId"`
MenuID string `json:"menuId"`
AuthorityId string `json:"-"`
Children []SysMenu `json:"children"`
}
// 为角色增加menu树
func (m *SysMenu) AddMenuAuthority(menus []SysBaseMenu, authorityId string) (err error) {
var menu SysMenu
global.GVA_DB.Where("authority_id = ? ", authorityId).Unscoped().Delete(&SysMenu{})
for _, v := range menus {
menu.SysBaseMenu = v
menu.AuthorityId = authorityId
menu.MenuId = fmt.Sprintf("%v", v.ID)
menu.ID = 0
err = global.GVA_DB.Create(&menu).Error
if err != nil {
return err
}
}
var auth SysAuthority
auth.AuthorityId = authorityId
auth.SysBaseMenus = menus
@@ -35,24 +22,27 @@ func (m *SysMenu) AddMenuAuthority(menus []SysBaseMenu, authorityId string) (err
}
// 查看当前角色树
func (m *SysMenu) GetMenuAuthority(authorityId string) (err error, menus []SysMenu) {
err = global.GVA_DB.Where("authority_id = ?", authorityId).Find(&menus).Error
return err, menus
func (m *SysMenu) GetMenuAuthority(authorityId string) (err error, menus []SysBaseMenu) {
var a SysAuthority
err = global.GVA_DB.Preload("SysBaseMenus").Where("authority_id = ?", authorityId).First(&a).Error
return err, a.SysBaseMenus
}
//获取动态路由树
func (m *SysMenu) GetMenuTree(authorityId string) (err error, menus []SysMenu) {
err = global.GVA_DB.Where("authority_id = ? AND parent_id = ?", authorityId, 0).Order("sort", true).Find(&menus).Error
SQLstatement := "SELECT authority_menu.created_at,authority_menu.updated_at,authority_menu.deleted_at,authority_menu.menu_level,authority_menu.parent_id,authority_menu.path,authority_menu.`name`,authority_menu.hidden,authority_menu.component,authority_menu.title,authority_menu.icon,authority_menu.sort,authority_menu.menu_id,authority_menu.authority_id FROM authority_menu WHERE authority_menu.authority_id = ? AND authority_menu.parent_id = ?"
err = global.GVA_DB.Raw(SQLstatement, authorityId, 0).Scan(&menus).Error
for i := 0; i < len(menus); i++ {
err = getChildrenList(&menus[i])
err = getChildrenList(&menus[i], SQLstatement)
}
return err, menus
}
func getChildrenList(menu *SysMenu) (err error) {
err = global.GVA_DB.Where("authority_id = ? AND parent_id = ?", menu.AuthorityId, menu.MenuId).Order("sort", true).Find(&menu.Children).Error
func getChildrenList(menu *SysMenu, SQLstatement string) (err error) {
err = global.GVA_DB.Raw(SQLstatement, menu.AuthorityId, menu.MenuID).Scan(&menu.Children).Error
for i := 0; i < len(menu.Children); i++ {
err = getChildrenList(&menu.Children[i])
err = getChildrenList(&menu.Children[i], SQLstatement)
}
return err
}

8
server/model/sys_base_menu.go
View File

@@ -17,7 +17,6 @@ type SysBaseMenu struct {
Component string `json:"component"`
Sort string `json:"sort"`
Meta `json:"meta"`
NickName string `json:"nickName"`
SysAuthoritys []SysAuthority `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
Children []SysBaseMenu `json:"children"`
}
@@ -31,7 +30,6 @@ type Meta struct {
func (b *SysBaseMenu) AddBaseMenu() (err error) {
findOne := global.GVA_DB.Where("name = ?", b.Name).Find(&SysBaseMenu{}).Error
if findOne != nil {
b.NickName = b.Title
err = global.GVA_DB.Create(b).Error
} else {
err = errors.New("存在重复name，请修改name")
@@ -43,8 +41,7 @@ func (b *SysBaseMenu) AddBaseMenu() (err error) {
func (b *SysBaseMenu) DeleteBaseMenu(id float64) (err error) {
err = global.GVA_DB.Where("parent_id = ?", id).First(&SysBaseMenu{}).Error
if err != nil {
err = global.GVA_DB.Where("id = ?", id).Delete(&b).Error
err = global.GVA_DB.Where("menu_id = ?", id).Unscoped().Delete(&SysMenu{}).Error
err = global.GVA_DB.Preload("SysAuthoritys").Where("id = ?", id).Delete(&b).Association("SysAuthoritys").Delete(b.SysAuthoritys).Error
} else {
return errors.New("此菜单存在子菜单不可删除")
}
@@ -62,14 +59,13 @@ func (b *SysBaseMenu) UpdateBaseMenu() (err error) {
upDateMap["title"] = b.Title
upDateMap["icon"] = b.Icon
upDateMap["sort"] = b.Sort
upDateMap["nick_name"] = b.Title
err = global.GVA_DB.Where("id = ?", b.ID).Find(&SysBaseMenu{}).Updates(upDateMap).Error
err1 := global.GVA_DB.Where("menu_id = ?", b.ID).Find(&[]SysMenu{}).Updates(upDateMap).Error
fmt.Printf("菜单修改时候，关联菜单err1:%v,err:%v", err1, err)
return err
}
//当前选中角色所拥有的路由
// 返回当前选中menu
func (b *SysBaseMenu) GetBaseMenuById(id float64) (err error, menu SysBaseMenu) {
err = global.GVA_DB.Where("id = ?", id).First(&menu).Error
return