iotlcm-public/iotlcm
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync: 同步 v1.0.4 并脱敏配置与镜像

Browse Source
This commit is contained in:
MiFaZhan
2026-10-29 14:36:49 +08:00
parent 743e8e6e6e
commit 2206a393f7
516 changed files with 18119 additions and 2253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/internal/logic/agent/agent_menu.go
+21 -67
View File
@@ -46,17 +46,22 @@ func (s *sAgentMenu) AllowedMenuIdsByDeptRole(ctx context.Context, deptId int64)
return []int64{}, nil
}
if dept.DeptRole == consts.SuperAdminRoleId {
return s.allMenuIds(ctx)
menuIds, err = s.allMenuIds(ctx)
} else {
var roleMenus []*entity.SysRoleMenu
roleMenus, err = service.SysRole().GetRoleListMenu(ctx, []int64{dept.DeptRole})
for _, item := range roleMenus {
menuIds = append(menuIds, item.MenuId)
}
}
roleMenus, err := service.SysRole().GetRoleListMenu(ctx, []int64{dept.DeptRole})
if err != nil {
return nil, err
}
for _, item := range roleMenus {
menuIds = append(menuIds, item.MenuId)
}
slices.Sort(menuIds)
menuIds = slices.Compact(menuIds)
if !contexts.IsSuperAdmin(ctx) {
return rolepolicy.RestrictAssignableMenus(ctx, dept.TenantId, dept.DeptId, contexts.GetUserId(ctx), menuIds)
}
return rolepolicy.RestrictMenus(ctx, dept.TenantId, dept.DeptId, menuIds)
}
@@ -83,32 +88,6 @@ func (s *sAgentMenu) getRoleById(ctx context.Context, roleId int64) (role *entit
return role, err
}
// filterMenuIdsByAllowed 筛选出当前机构允许的菜单ID
func (s *sAgentMenu) filterMenuIdsByAllowed(ctx context.Context, deptId int64, menuIds []int64) (res []int64, err error) {
if deptId == 0 {
deptId = contexts.GetDeptId(ctx)
}
allowed, err := s.AllowedMenuIdsByDeptRole(ctx, deptId)
if err != nil {
return nil, err
}
allowed, err = s.withMenuAncestors(ctx, allowed)
if err != nil {
return nil, err
}
allowedMap := make(map[int64]struct{}, len(allowed))
for _, menuId := range allowed {
allowedMap[menuId] = struct{}{}
}
for _, menuId := range menuIds {
if _, ok := allowedMap[menuId]; ok {
res = append(res, menuId)
}
}
slices.Sort(res)
return slices.Compact(res), nil
}
func (s *sAgentMenu) AllowedMenuTree(ctx context.Context, deptId int64) (tree []*model.SysMenuTreeModel, menuIds []int64, err error) {
deptId = contexts.GetDeptId(ctx)
menuIds, err = s.AllowedMenuIdsByDeptRole(ctx, deptId)
@@ -118,13 +97,13 @@ func (s *sAgentMenu) AllowedMenuTree(ctx context.Context, deptId int64) (tree []
if len(menuIds) == 0 && !contexts.IsSuperAdmin(ctx) {
return []*model.SysMenuTreeModel{}, []int64{}, nil
}
menuIds, err = s.withMenuAncestors(ctx, menuIds)
visibleMenuIds, err := rolepolicy.WithMenuAncestors(ctx, menuIds)
if err != nil {
return nil, nil, err
}
mod := service.SysMenu().Model(ctx)
if !contexts.IsSuperAdmin(ctx) {
mod = mod.WhereIn(dao.SysMenu.Columns().MenuId, menuIds)
mod = mod.WhereIn(dao.SysMenu.Columns().MenuId, visibleMenuIds)
}
var menus []*entity.SysMenu
err = mod.Where(dao.SysMenu.Columns().Status, consts.SysMenuStatusNormal).
@@ -134,43 +113,18 @@ func (s *sAgentMenu) AllowedMenuTree(ctx context.Context, deptId int64) (tree []
return nil, nil, err
}
tree = s.buildMenuList(menus)
activeMenuIds := make([]int64, 0, len(menus))
for _, menu := range menus {
activeMenuIds = append(activeMenuIds, menu.MenuId)
}
if contexts.IsSuperAdmin(ctx) {
menuIds = activeMenuIds
} else {
menuIds = rolepolicy.Intersect(menuIds, activeMenuIds)
}
return tree, menuIds, nil
}
func (s *sAgentMenu) withMenuAncestors(ctx context.Context, menuIds []int64) ([]int64, error) {
seen := make(map[int64]struct{}, len(menuIds))
queue := append([]int64{}, menuIds...)
for _, menuId := range menuIds {
seen[menuId] = struct{}{}
}
for len(queue) > 0 {
var menus []*entity.SysMenu
err := service.SysMenu().Model(ctx).
WhereIn(dao.SysMenu.Columns().MenuId, queue).
Scan(&menus)
if err != nil {
return nil, err
}
queue = queue[:0]
for _, menu := range menus {
if menu.ParentId == 0 {
continue
}
if _, ok := seen[menu.ParentId]; ok {
continue
}
seen[menu.ParentId] = struct{}{}
queue = append(queue, menu.ParentId)
}
}
res := make([]int64, 0, len(seen))
for menuId := range seen {
res = append(res, menuId)
}
slices.Sort(res)
return res, nil
}
func (s *sAgentMenu) buildMenuList(menus []*entity.SysMenu) (list []*model.SysMenuTreeModel) {
for _, menu := range menus {
list = append(list, &model.SysMenuTreeModel{