xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/pure-dev' into abp

Browse Source
This commit is contained in:
橙子
2024-09-07 13:49:43 +08:00
parent f7790c46d2 8374c81860
commit d4dd531ac4
29 changed files with 1149 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuCreateInputVo.cs
View File

@@ -24,5 +24,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Menu
public string? Component { get; set; }
public string? Query { get; set; }
public int OrderNum { get; set; }
public MenuSourceEnum MenuSource { get; set; } = MenuSourceEnum.Ruoyi;
public string? RouterName { get; set; }
}
}

3
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuGetListInputVo.cs
View File

@@ -1,4 +1,5 @@
using Volo.Abp.Application.Dtos;
using Yi.Framework.Rbac.Domain.Shared.Enums;
namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Menu
{
@@ -7,6 +8,6 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Menu
public bool? State { get; set; }
public string? MenuName { get; set; }
public MenuSourceEnum MenuSource { get; set; } = MenuSourceEnum.Ruoyi;
}
}

3
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuUpdateInputVo.cs
View File

@@ -20,7 +20,6 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Menu
public string? Component { get; set; }
public string? Query { get; set; }
public int OrderNum { get; set; }
//public List<MenuEntity>? Children { get; set; }
public string? RouterName { get; set; }
}
}

23
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs
View File

@@ -275,11 +275,12 @@ namespace Yi.Framework.Rbac.Application.Services
/// <summary>
/// 获取当前登录用户的前端路由
/// 支持ruoyi/pure
/// </summary>
/// <returns></returns>
[Authorize]
[Route("account/Vue3Router")]
public async Task<List<Vue3RouterDto>> GetVue3Router()
[Route("account/Vue3Router/{routerType?}")]
public async Task<object> GetVue3Router([FromRoute]string? routerType)
{
var userId = _currentUser.Id;
if (_currentUser.Id is null)
@@ -296,10 +297,20 @@ namespace Yi.Framework.Rbac.Application.Services
menus = ObjectMapper.Map<List<MenuAggregateRoot>, List<MenuDto>>(await _menuRepository.GetListAsync());
}
//将后端菜单转换成前端路由，组件级别需要过滤
List<Vue3RouterDto> routers =
ObjectMapper.Map<List<MenuDto>, List<MenuAggregateRoot>>(menus).Vue3RouterBuild();
return routers;
object output = null;
if (routerType is null ||routerType=="ruoyi")
{
//将后端菜单转换成前端路由，组件级别需要过滤
output =
ObjectMapper.Map<List<MenuDto>, List<MenuAggregateRoot>>(menus).Vue3RuoYiRouterBuild();
}
else if (routerType =="pure")
{
//将后端菜单转换成前端路由，组件级别需要过滤
output =
ObjectMapper.Map<List<MenuDto>, List<MenuAggregateRoot>>(menus).Vue3PureRouterBuild();
}
return output;
}
/// <summary>

11
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/MenuService.cs
View File

@@ -28,6 +28,7 @@ namespace Yi.Framework.Rbac.Application.Services.System
var entities = await _repository._DbQueryable.WhereIF(!string.IsNullOrEmpty(input.MenuName), x => x.MenuName.Contains(input.MenuName!))
.WhereIF(input.State is not null, x => x.State == input.State)
.Where(x=>x.MenuSource==input.MenuSource)
.OrderByDescending(x => x.OrderNum)
.ToListAsync();
//.ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
@@ -45,5 +46,15 @@ namespace Yi.Framework.Rbac.Application.Services.System
return await MapToGetListOutputDtosAsync(entities);
}
public override Task<MenuGetOutputDto> UpdateAsync(Guid id, MenuUpdateInputVo input)
{
return base.UpdateAsync(id, input);
}
public override Task<MenuGetOutputDto> CreateAsync(MenuCreateInputVo input)
{
return base.CreateAsync(input);
}
}
}

5
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Dtos/UserRoleMenuDto.cs
View File

@@ -195,6 +195,11 @@ namespace Yi.Framework.Rbac.Domain.Shared.Dtos
public class MenuDto
{
public Guid Id { get; set; }
/// <summary>
/// 菜单来源
/// </summary>
public MenuSourceEnum MenuSource { get; set; }
public string? RouterName { get; set; }
/// <summary>
/// 逻辑删除

10
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Dtos/Vue3PureRouterDto.cs
View File

@@ -2,10 +2,13 @@
public class Vue3PureRouterDto
{
public Guid Id { get; set; }
public Guid ParentId { get; set; }
public string Path { get; set; }
public string Name { get; set; }
public MetaPureRouterDto Meta { get; set; } = new MetaPureRouterDto();
public string? component { get; set; }
public List<Vue3PureRouterDto>? Children { get; set; }
}
@@ -14,11 +17,6 @@ public class MetaPureRouterDto
public string Icon { get; set; }
public string Title { get; set; }
/// <summary>
/// 排序
/// </summary>
public string Rank { get; set; }
public List<string>? Roles { get; set; }
public List<string>? Auths { get; set; }

7
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Enums/MenuSourceEnum.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Yi.Framework.Rbac.Domain.Shared.Enums;
public enum MenuSourceEnum
{
Ruoyi=0,
Pure=1
}

72
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuAggregateRoot.cs
View File

@@ -1,4 +1,6 @@
using SqlSugar;
using System.Web;
using NUglify.Helpers;
using SqlSugar;
using Volo.Abp;
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities;
@@ -75,7 +77,12 @@ namespace Yi.Framework.Rbac.Domain.Entities
/// <summary>
/// 菜单名
/// </summary>
public string MenuName { get; set; } = string.Empty;
public string MenuName { get; set; }
/// <summary>
/// 路由名称
/// </summary>
public string? RouterName { get; set; }
/// <summary>
///
@@ -137,6 +144,11 @@ namespace Yi.Framework.Rbac.Domain.Entities
[SugarColumn(ColumnName = "Component")]
public string? Component { get; set; }
/// <summary>
/// 菜单来源
/// </summary>
public MenuSourceEnum MenuSource { get; set; } = MenuSourceEnum.Ruoyi;
/// <summary>
/// 路由参数
///</summary>
@@ -156,9 +168,13 @@ namespace Yi.Framework.Rbac.Domain.Entities
/// </summary>
/// <param name="menus"></param>
/// <returns></returns>
public static List<Vue3RouterDto> Vue3RouterBuild(this List<MenuAggregateRoot> menus)
public static List<Vue3RouterDto> Vue3RuoYiRouterBuild(this List<MenuAggregateRoot> menus)
{
menus = menus.Where(m => m.MenuType != MenuTypeEnum.Component).ToList();
menus = menus
.Where(m => m.State == true)
.Where(m => m.MenuType != MenuTypeEnum.Component)
.Where(m => m.MenuSource == MenuSourceEnum.Ruoyi)
.ToList();
List<Vue3RouterDto> routers = new();
foreach (var m in menus)
{
@@ -216,16 +232,58 @@ namespace Yi.Framework.Rbac.Domain.Entities
return TreeHelper.SetTree(routers);
}
/// <summary>
/// 构建vue3 pure路由
/// </summary>
/// <param name="menus"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public static List<Vue3PureRouterDto> Vue3PureRouterBuild(this List<MenuAggregateRoot> menus)
{
throw new NotImplementedException();
//pure的菜单为树形
var allRouters = menus
.Where(m => m.State == true)
.Where(m => m.MenuType != MenuTypeEnum.Component)
.Where(m => m.MenuSource == MenuSourceEnum.Pure)
.Select(m => new Vue3PureRouterDto
{
Path =m.Router.StartsWith("/")?m.Router:"/"+m.Router,
Name =m.IsLink==true?"Link": m.RouterName,
component = m.Component,
Meta = new MetaPureRouterDto()
{
showLink = m.IsShow,
FrameSrc = m.IsLink == true ? m.Router : null,
Auths = new List<string>() { m.PermissionCode },
Icon = m.MenuIcon,
Title = m.MenuName,
},
Children =null,
Id = m.Id,
ParentId = m.ParentId
})
.ToList();
var routerDic = allRouters.GroupBy(x => x.ParentId).ToDictionary(x => x.Key,y=>y.ToList());
//根路由
if (!routerDic.TryGetValue(Guid.Empty, out var rootRouters))
{
return new List<Vue3PureRouterDto>();
}
Stack<Vue3PureRouterDto> stack = new Stack<Vue3PureRouterDto>(rootRouters);
while (stack.Count > 0)
{
var currentRouter = stack.Pop();
if (routerDic.TryGetValue(currentRouter.Id, out var items))
{
currentRouter.Children = items;
items?.ForEach(x => stack.Push(x));
}
}
return rootRouters;
}
}
}

9
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs
View File

@@ -231,10 +231,11 @@ namespace Yi.Framework.Rbac.Domain.Managers
var userRoleMenu = new UserRoleMenuDto();
//首先获取到该用户全部信息，导航到角色、菜单，(菜单需要去重,完全交给Set来处理即可)
//if (user is null)
//{
// throw new UserFriendlyException($"数据错误，用户id：{nameof(userId)} 不存在，请重新登录");
//}
if (user is null)
{
//为了解决token前端缓存，后端数据库重新dbseed
throw new UserFriendlyException($"数据错误，查询用户不存在，请重新登录");
}
user.EncryPassword.Password = string.Empty;
user.EncryPassword.Salt = string.Empty;

519
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuPureDataSeed.cs Normal file
View File

@@ -0,0 +1,519 @@
using Volo.Abp.Data;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Guids;
using Yi.Framework.Rbac.Domain.Entities;
using Yi.Framework.Rbac.Domain.Shared.Enums;
using Yi.Framework.SqlSugarCore.Abstractions;
namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
{
public class MenuPureDataSeed : IDataSeedContributor, ITransientDependency
{
private ISqlSugarRepository<MenuAggregateRoot> _repository;
private IGuidGenerator _guidGenerator;
public MenuPureDataSeed(ISqlSugarRepository<MenuAggregateRoot> repository, IGuidGenerator guidGenerator)
{
_repository = repository;
_guidGenerator = guidGenerator;
}
public async Task SeedAsync(DataSeedContext context)
{
if (!await _repository.IsAnyAsync(x => x.MenuName == "系统管理"&&x.MenuSource==MenuSourceEnum.Pure))
{
await _repository.InsertManyAsync(GetSeedData());
}
}
public List<MenuAggregateRoot> GetSeedData()
{
List<MenuAggregateRoot> entities = new List<MenuAggregateRoot>();
//系统管理
MenuAggregateRoot system = new MenuAggregateRoot(_guidGenerator.Create(), Guid.Empty)
{
MenuName = "系统管理",
MenuType = MenuTypeEnum.Catalogue,
Router = "/system",
MenuIcon = "ri:settings-3-line",
OrderNum = 100
};
entities.Add(system);
//系统监控
MenuAggregateRoot monitoring = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "系统监控",
MenuType = MenuTypeEnum.Catalogue,
Router = "/monitor",
MenuIcon = "ep:monitor",
OrderNum = 99,
};
entities.Add(monitoring);
//在线用户
MenuAggregateRoot online = new MenuAggregateRoot(_guidGenerator.Create(), monitoring.Id)
{
MenuName = "在线用户",
PermissionCode = "monitor:online:list",
MenuType = MenuTypeEnum.Menu,
Router = "/monitor/online-user",
MenuIcon = "ri:user-voice-line",
OrderNum = 100,
RouterName = "OnlineUser",
Component = "monitor/online/index"
};
entities.Add(online);
//Yi框架
MenuAggregateRoot guide = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "Yi框架",
MenuType = MenuTypeEnum.Catalogue,
Router = "https://ccnetcore.com",
IsLink = true,
MenuIcon = "ri:at-line",
OrderNum = 90,
Component = null
};
entities.Add(guide);
//用户管理
MenuAggregateRoot user = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "用户管理",
PermissionCode = "system:user:list",
MenuType = MenuTypeEnum.Menu,
Router = "/system/user/index",
MenuIcon = "ri:admin-line",
OrderNum = 100,
ParentId = system.Id,
RouterName = "SystemUser"
};
entities.Add(user);
MenuAggregateRoot userQuery = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "用户查询",
PermissionCode = "system:user:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = user.Id,
IsDeleted = false
};
entities.Add(userQuery);
MenuAggregateRoot userAdd = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "用户新增",
PermissionCode = "system:user:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = user.Id,
IsDeleted = false
};
entities.Add(userAdd);
MenuAggregateRoot userEdit = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "用户修改",
PermissionCode = "system:user:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = user.Id,
IsDeleted = false
};
entities.Add(userEdit);
MenuAggregateRoot userRemove = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "用户删除",
PermissionCode = "system:user:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = user.Id,
IsDeleted = false
};
entities.Add(userRemove);
MenuAggregateRoot userResetPwd = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "重置密码",
PermissionCode = "system:user:resetPwd",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = user.Id,
IsDeleted = false
};
entities.Add(userResetPwd);
//角色管理
MenuAggregateRoot role = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "角色管理",
PermissionCode = "system:role:list",
MenuType = MenuTypeEnum.Menu,
Router = "/system/role/index",
MenuIcon = "ri:admin-fill",
OrderNum = 99,
ParentId = system.Id,
RouterName = "SystemRole"
};
entities.Add(role);
MenuAggregateRoot roleQuery = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "角色查询",
PermissionCode = "system:role:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = role.Id,
IsDeleted = false
};
entities.Add(roleQuery);
MenuAggregateRoot roleAdd = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "角色新增",
PermissionCode = "system:role:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = role.Id,
IsDeleted = false
};
entities.Add(roleAdd);
MenuAggregateRoot roleEdit = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "角色修改",
PermissionCode = "system:role:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = role.Id,
IsDeleted = false
};
entities.Add(roleEdit);
MenuAggregateRoot roleRemove = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "角色删除",
PermissionCode = "system:role:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = role.Id,
IsDeleted = false
};
entities.Add(roleRemove);
//菜单管理
MenuAggregateRoot menu = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "菜单管理",
PermissionCode = "system:menu:list",
MenuType = MenuTypeEnum.Menu,
Router = "/system/menu/index",
MenuIcon = "ep:menu",
OrderNum = 98,
ParentId = system.Id,
RouterName = "SystemMenu"
};
entities.Add(menu);
MenuAggregateRoot menuQuery = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "菜单查询",
PermissionCode = "system:menu:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = menu.Id,
IsDeleted = false
};
entities.Add(menuQuery);
MenuAggregateRoot menuAdd = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "菜单新增",
PermissionCode = "system:menu:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = menu.Id,
IsDeleted = false
};
entities.Add(menuAdd);
MenuAggregateRoot menuEdit = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "菜单修改",
PermissionCode = "system:menu:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = menu.Id,
IsDeleted = false
};
entities.Add(menuEdit);
MenuAggregateRoot menuRemove = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "菜单删除",
PermissionCode = "system:menu:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = menu.Id,
IsDeleted = false
};
entities.Add(menuRemove);
//部门管理
MenuAggregateRoot dept = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "部门管理",
PermissionCode = "system:dept:list",
MenuType = MenuTypeEnum.Menu,
Router = "/system/dept/index",
MenuIcon = "ri:git-branch-line",
OrderNum = 97,
ParentId = system.Id,
RouterName = "SystemDept"
};
entities.Add(dept);
MenuAggregateRoot deptQuery = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "部门查询",
PermissionCode = "system:dept:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = dept.Id,
IsDeleted = false
};
entities.Add(deptQuery);
MenuAggregateRoot deptAdd = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "部门新增",
PermissionCode = "system:dept:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = dept.Id,
IsDeleted = false
};
entities.Add(deptAdd);
MenuAggregateRoot deptEdit = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "部门修改",
PermissionCode = "system:dept:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = dept.Id,
IsDeleted = false
};
entities.Add(deptEdit);
MenuAggregateRoot deptRemove = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "部门删除",
PermissionCode = "system:dept:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = dept.Id,
IsDeleted = false
};
entities.Add(deptRemove);
//岗位管理
MenuAggregateRoot post = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "岗位管理",
PermissionCode = "system:post:list",
MenuType = MenuTypeEnum.Menu,
Router = "/system/post/index",
MenuIcon = "ant-design:deployment-unit-outlined",
OrderNum = 96,
ParentId = system.Id,
RouterName = "SystemPost"
};
entities.Add(post);
MenuAggregateRoot postQuery = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "岗位查询",
PermissionCode = "system:post:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = post.Id,
IsDeleted = false
};
entities.Add(postQuery);
MenuAggregateRoot postAdd = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "岗位新增",
PermissionCode = "system:post:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = post.Id,
IsDeleted = false
};
entities.Add(postAdd);
MenuAggregateRoot postEdit = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "岗位修改",
PermissionCode = "system:post:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = post.Id,
IsDeleted = false
};
entities.Add(postEdit);
MenuAggregateRoot postRemove = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "岗位删除",
PermissionCode = "system:post:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = post.Id,
IsDeleted = false
};
entities.Add(postRemove);
//操作日志
MenuAggregateRoot operationLog = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "操作日志",
PermissionCode = "monitor:operlog:list",
MenuType = MenuTypeEnum.Menu,
Router = "/monitor/operation-logs",
MenuIcon = "ri:history-fill",
OrderNum = 100,
ParentId = monitoring.Id,
RouterName = "OperationLog",
Component = "monitor/logs/operation/index"
};
entities.Add(operationLog);
MenuAggregateRoot operationLogQuery = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "操作查询",
PermissionCode = "monitor:operlog:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = operationLog.Id,
IsDeleted = false
};
entities.Add(operationLogQuery);
MenuAggregateRoot operationLogRemove = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "操作删除",
PermissionCode = "monitor:operlog:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = operationLog.Id,
IsDeleted = false
};
entities.Add(operationLogRemove);
//登录日志
MenuAggregateRoot loginLog = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "登录日志",
PermissionCode = "monitor:logininfor:list",
MenuType = MenuTypeEnum.Menu,
Router = "/monitor/login-logs",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "monitor/logs/login/index",
MenuIcon = "ri:window-line",
OrderNum = 100,
ParentId = monitoring.Id,
RouterName = "LoginLog",
};
entities.Add(loginLog);
MenuAggregateRoot loginLogQuery = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "登录查询",
PermissionCode = "monitor:logininfor:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = loginLog.Id,
IsDeleted = false
};
entities.Add(loginLogQuery);
MenuAggregateRoot loginLogRemove = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "登录删除",
PermissionCode = "monitor:logininfor:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = loginLog.Id,
IsDeleted = false,
};
entities.Add(loginLogRemove);
//默认值
entities.ForEach(m =>
{
m.IsDeleted = false;
m.State = true;
m.MenuSource = MenuSourceEnum.Pure;
m.IsShow = true;
});
var p = entities.GroupBy(x => x.Id);
foreach (var k in p)
{
if (k.ToList().Count > 1)
{
Console.WriteLine("菜单id重复");
}
}
return entities;
}
}
}

664
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs → Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuRuoYiDataSeed.cs
View File

@@ -7,11 +7,11 @@ using Yi.Framework.SqlSugarCore.Abstractions;
namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
{
public class MenuDataSeed : IDataSeedContributor, ITransientDependency
public class MenuRuoYiDataSeed : IDataSeedContributor, ITransientDependency
{
private ISqlSugarRepository<MenuAggregateRoot> _repository;
private IGuidGenerator _guidGenerator;
public MenuDataSeed(ISqlSugarRepository<MenuAggregateRoot> repository, IGuidGenerator guidGenerator)
public MenuRuoYiDataSeed(ISqlSugarRepository<MenuAggregateRoot> repository, IGuidGenerator guidGenerator)
{
_repository = repository;
_guidGenerator = guidGenerator;
@@ -19,7 +19,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
public async Task SeedAsync(DataSeedContext context)
{
if (!await _repository.IsAnyAsync(x => x.MenuName == "系统管理"))
if (!await _repository.IsAnyAsync(x => x.MenuName == "系统管理"&&x.MenuSource==MenuSourceEnum.Ruoyi))
{
await _repository.InsertManyAsync(GetSeedData());
}
@@ -54,7 +54,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
IsLink = false,
MenuIcon = "build",
OrderNum = 91,
IsDeleted = false
IsDeleted = false,
};
entities.Add(code);
@@ -229,332 +229,332 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
entities.Add(swagger);
//ERP
MenuAggregateRoot erp = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "ERP(待更新)",
MenuType = MenuTypeEnum.Catalogue,
Router = "/erp",
IsShow = true,
IsLink = false,
MenuIcon = "international",
OrderNum = 96,
IsDeleted = false
};
entities.Add(erp);
//供应商定义
MenuAggregateRoot supplier = new MenuAggregateRoot(_guidGenerator.Create(), erp.Id)
{
MenuName = "供应商定义",
PermissionCode = "erp:supplier:list",
MenuType = MenuTypeEnum.Menu,
Router = "supplier",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/supplier/index",
MenuIcon = "education",
OrderNum = 100,
IsDeleted = false
};
entities.Add(supplier);
MenuAggregateRoot supplierQuery = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id)
{
MenuName = "供应商查询",
PermissionCode = "erp:supplier:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(supplierQuery);
MenuAggregateRoot supplierAdd = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id)
{
MenuName = "供应商新增",
PermissionCode = "erp:supplier:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(supplierAdd);
MenuAggregateRoot supplierEdit = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id)
{
MenuName = "供应商修改",
PermissionCode = "erp:supplier:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(supplierEdit);
MenuAggregateRoot supplierRemove = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id)
{
MenuName = "供应商删除",
PermissionCode = "erp:supplier:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(supplierRemove);
//仓库定义
MenuAggregateRoot warehouse = new MenuAggregateRoot(_guidGenerator.Create(), erp.Id)
{
MenuName = "仓库定义",
PermissionCode = "erp:warehouse:list",
MenuType = MenuTypeEnum.Menu,
Router = "warehouse",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/warehouse/index",
MenuIcon = "education",
OrderNum = 100,
IsDeleted = false
};
entities.Add(warehouse);
MenuAggregateRoot warehouseQuery = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id)
{
MenuName = "仓库查询",
PermissionCode = "erp:warehouse:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = warehouse.Id,
IsDeleted = false
};
entities.Add(warehouseQuery);
MenuAggregateRoot warehouseAdd = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id)
{
MenuName = "仓库新增",
PermissionCode = "erp:warehouse:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(warehouseAdd);
MenuAggregateRoot warehouseEdit = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id)
{
MenuName = "仓库修改",
PermissionCode = "erp:warehouse:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(warehouseEdit);
MenuAggregateRoot warehouseRemove = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id)
{
MenuName = "仓库删除",
PermissionCode = "erp:warehouse:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(warehouseRemove);
//单位定义
MenuAggregateRoot unit = new MenuAggregateRoot(_guidGenerator.Create(), erp.Id)
{
MenuName = "单位定义",
PermissionCode = "erp:unit:list",
MenuType = MenuTypeEnum.Menu,
Router = "unit",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/unit/index",
MenuIcon = "education",
OrderNum = 100,
IsDeleted = false
};
entities.Add(unit);
MenuAggregateRoot unitQuery = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id)
{
MenuName = "单位查询",
PermissionCode = "erp:unit:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(unitQuery);
MenuAggregateRoot unitAdd = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id)
{
MenuName = "单位新增",
PermissionCode = "erp:unit:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(unitAdd);
MenuAggregateRoot unitEdit = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id)
{
MenuName = "单位修改",
PermissionCode = "erp:unit:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(unitEdit);
MenuAggregateRoot unitRemove = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id)
{
MenuName = "单位删除",
PermissionCode = "erp:unit:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
IsDeleted = false
};
entities.Add(unitRemove);
//物料定义
MenuAggregateRoot material = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "物料定义",
PermissionCode = "erp:material:list",
MenuType = MenuTypeEnum.Menu,
Router = "material",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/material/index",
MenuIcon = "education",
OrderNum = 100,
ParentId = erp.Id,
IsDeleted = false
};
entities.Add(material);
MenuAggregateRoot materialQuery = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "物料查询",
PermissionCode = "erp:material:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = material.Id,
IsDeleted = false
};
entities.Add(materialQuery);
MenuAggregateRoot materialAdd = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "物料新增",
PermissionCode = "erp:material:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = material.Id,
IsDeleted = false
};
entities.Add(materialAdd);
MenuAggregateRoot materialEdit = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "物料修改",
PermissionCode = "erp:material:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = material.Id,
IsDeleted = false
};
entities.Add(materialEdit);
MenuAggregateRoot materialRemove = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "物料删除",
PermissionCode = "erp:material:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = material.Id,
IsDeleted = false
};
entities.Add(materialRemove);
//采购订单
MenuAggregateRoot purchase = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "采购订单",
PermissionCode = "erp:purchase:list",
MenuType = MenuTypeEnum.Menu,
Router = "purchase",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/purchase/index",
MenuIcon = "education",
OrderNum = 100,
ParentId = erp.Id,
IsDeleted = false
};
entities.Add(purchase);
MenuAggregateRoot purchaseQuery = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "采购订单查询",
PermissionCode = "erp:purchase:query",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = purchase.Id,
IsDeleted = false
};
entities.Add(purchaseQuery);
MenuAggregateRoot purchaseAdd = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "采购订单新增",
PermissionCode = "erp:purchase:add",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = purchase.Id,
IsDeleted = false
};
entities.Add(purchaseAdd);
MenuAggregateRoot purchaseEdit = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "采购订单修改",
PermissionCode = "erp:purchase:edit",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = purchase.Id,
IsDeleted = false
};
entities.Add(purchaseEdit);
MenuAggregateRoot purchaseRemove = new MenuAggregateRoot(_guidGenerator.Create())
{
MenuName = "采购订单删除",
PermissionCode = "erp:purchase:remove",
MenuType = MenuTypeEnum.Component,
OrderNum = 100,
ParentId = purchase.Id,
IsDeleted = false
};
entities.Add(purchaseRemove);
// //ERP
// MenuAggregateRoot erp = new MenuAggregateRoot(_guidGenerator.Create())
// {
// MenuName = "ERP(待更新)",
// MenuType = MenuTypeEnum.Catalogue,
// Router = "/erp",
// IsShow = true,
// IsLink = false,
// MenuIcon = "international",
// OrderNum = 96,
// IsDeleted = false
// };
// entities.Add(erp);
//
//
//
// //供应商定义
// MenuAggregateRoot supplier = new MenuAggregateRoot(_guidGenerator.Create(), erp.Id)
// {
// MenuName = "供应商定义",
// PermissionCode = "erp:supplier:list",
// MenuType = MenuTypeEnum.Menu,
// Router = "supplier",
// IsShow = true,
// IsLink = false,
// IsCache = true,
// Component = "erp/supplier/index",
// MenuIcon = "education",
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(supplier);
//
// MenuAggregateRoot supplierQuery = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id)
// {
// MenuName = "供应商查询",
// PermissionCode = "erp:supplier:query",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(supplierQuery);
//
// MenuAggregateRoot supplierAdd = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id)
// {
// MenuName = "供应商新增",
// PermissionCode = "erp:supplier:add",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
//
// IsDeleted = false
// };
// entities.Add(supplierAdd);
//
// MenuAggregateRoot supplierEdit = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id)
// {
// MenuName = "供应商修改",
// PermissionCode = "erp:supplier:edit",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(supplierEdit);
//
// MenuAggregateRoot supplierRemove = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id)
// {
// MenuName = "供应商删除",
// PermissionCode = "erp:supplier:remove",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(supplierRemove);
//
//
// //仓库定义
// MenuAggregateRoot warehouse = new MenuAggregateRoot(_guidGenerator.Create(), erp.Id)
// {
// MenuName = "仓库定义",
// PermissionCode = "erp:warehouse:list",
// MenuType = MenuTypeEnum.Menu,
// Router = "warehouse",
// IsShow = true,
// IsLink = false,
// IsCache = true,
// Component = "erp/warehouse/index",
// MenuIcon = "education",
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(warehouse);
//
// MenuAggregateRoot warehouseQuery = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id)
// {
// MenuName = "仓库查询",
// PermissionCode = "erp:warehouse:query",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// ParentId = warehouse.Id,
// IsDeleted = false
// };
// entities.Add(warehouseQuery);
//
// MenuAggregateRoot warehouseAdd = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id)
// {
// MenuName = "仓库新增",
// PermissionCode = "erp:warehouse:add",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(warehouseAdd);
//
// MenuAggregateRoot warehouseEdit = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id)
// {
// MenuName = "仓库修改",
// PermissionCode = "erp:warehouse:edit",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(warehouseEdit);
//
// MenuAggregateRoot warehouseRemove = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id)
// {
// MenuName = "仓库删除",
// PermissionCode = "erp:warehouse:remove",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(warehouseRemove);
//
//
// //单位定义
// MenuAggregateRoot unit = new MenuAggregateRoot(_guidGenerator.Create(), erp.Id)
// {
// MenuName = "单位定义",
// PermissionCode = "erp:unit:list",
// MenuType = MenuTypeEnum.Menu,
// Router = "unit",
// IsShow = true,
// IsLink = false,
// IsCache = true,
// Component = "erp/unit/index",
// MenuIcon = "education",
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(unit);
//
// MenuAggregateRoot unitQuery = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id)
// {
// MenuName = "单位查询",
// PermissionCode = "erp:unit:query",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(unitQuery);
//
// MenuAggregateRoot unitAdd = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id)
// {
// MenuName = "单位新增",
// PermissionCode = "erp:unit:add",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(unitAdd);
//
// MenuAggregateRoot unitEdit = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id)
// {
// MenuName = "单位修改",
// PermissionCode = "erp:unit:edit",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(unitEdit);
//
// MenuAggregateRoot unitRemove = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id)
// {
// MenuName = "单位删除",
// PermissionCode = "erp:unit:remove",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// IsDeleted = false
// };
// entities.Add(unitRemove);
//
//
// //物料定义
// MenuAggregateRoot material = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "物料定义",
// PermissionCode = "erp:material:list",
// MenuType = MenuTypeEnum.Menu,
// Router = "material",
// IsShow = true,
// IsLink = false,
// IsCache = true,
// Component = "erp/material/index",
// MenuIcon = "education",
// OrderNum = 100,
// ParentId = erp.Id,
// IsDeleted = false
// };
// entities.Add(material);
//
// MenuAggregateRoot materialQuery = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "物料查询",
// PermissionCode = "erp:material:query",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// ParentId = material.Id,
// IsDeleted = false
// };
// entities.Add(materialQuery);
//
// MenuAggregateRoot materialAdd = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "物料新增",
// PermissionCode = "erp:material:add",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// ParentId = material.Id,
// IsDeleted = false
// };
// entities.Add(materialAdd);
//
// MenuAggregateRoot materialEdit = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "物料修改",
// PermissionCode = "erp:material:edit",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// ParentId = material.Id,
// IsDeleted = false
// };
// entities.Add(materialEdit);
//
// MenuAggregateRoot materialRemove = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "物料删除",
// PermissionCode = "erp:material:remove",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// ParentId = material.Id,
// IsDeleted = false
// };
// entities.Add(materialRemove);
//
//
// //采购订单
// MenuAggregateRoot purchase = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "采购订单",
// PermissionCode = "erp:purchase:list",
// MenuType = MenuTypeEnum.Menu,
// Router = "purchase",
// IsShow = true,
// IsLink = false,
// IsCache = true,
// Component = "erp/purchase/index",
// MenuIcon = "education",
// OrderNum = 100,
// ParentId = erp.Id,
// IsDeleted = false
// };
// entities.Add(purchase);
//
// MenuAggregateRoot purchaseQuery = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "采购订单查询",
// PermissionCode = "erp:purchase:query",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// ParentId = purchase.Id,
// IsDeleted = false
// };
// entities.Add(purchaseQuery);
//
// MenuAggregateRoot purchaseAdd = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "采购订单新增",
// PermissionCode = "erp:purchase:add",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// ParentId = purchase.Id,
// IsDeleted = false
// };
// entities.Add(purchaseAdd);
//
// MenuAggregateRoot purchaseEdit = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "采购订单修改",
// PermissionCode = "erp:purchase:edit",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// ParentId = purchase.Id,
// IsDeleted = false
// };
// entities.Add(purchaseEdit);
//
// MenuAggregateRoot purchaseRemove = new MenuAggregateRoot(_guidGenerator.Create())
// {
//
// MenuName = "采购订单删除",
// PermissionCode = "erp:purchase:remove",
// MenuType = MenuTypeEnum.Component,
// OrderNum = 100,
// ParentId = purchase.Id,
// IsDeleted = false
// };
// entities.Add(purchaseRemove);
@@ -564,7 +564,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
MenuName = "Yi框架",
MenuType = MenuTypeEnum.Catalogue,
Router = "https://gitee.com/ccnetcore/yi",
Router = "https://ccnetcore.com",
IsShow = true,
IsLink = true,
MenuIcon = "guide",
@@ -1317,6 +1317,8 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
{
m.IsDeleted = false;
m.State = true;
m.MenuSource = MenuSourceEnum.Ruoyi;
m.IsShow = true;
});
var p = entities.GroupBy(x => x.Id);