diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Enums/NoticeTypeEnum.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Enums/NoticeTypeEnum.cs new file mode 100644 index 00000000..ae5fbff3 --- /dev/null +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Enums/NoticeTypeEnum.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Rbac.Domain.Shared.Enums +{ + public enum NoticeTypeEnum + { + [Description("走马灯")] + MerryGoRound = 0, + [Description("提示弹窗")] + Popup = 1 + } +} diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/NoticeEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/NoticeEntity.cs new file mode 100644 index 00000000..f25aa89f --- /dev/null +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/NoticeEntity.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +using Volo.Abp.Auditing; +using Volo.Abp.Domain.Entities; +using Yi.Framework.Core.Data; +using Yi.Framework.Rbac.Domain.Shared.Enums; + +namespace Yi.Framework.Rbac.Domain.Entities +{ + [SugarTable("Notice")] + public class NoticeEntity : Entity, ISoftDelete, IAuditedObject, IOrderNum, IState + { + + [SugarColumn(IsPrimaryKey = true)] + public override Guid Id { get; protected set; } + + /// + /// 公告标题 + /// + public string Title { get; set; } + + /// + /// 类型 + /// + public NoticeTypeEnum Type { get; set; } + + /// + /// 内容 + /// + [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString)] + public string Content { get; set; } + + public bool IsDeleted { get; set; } + + public DateTime CreationTime { get; set; } + + public Guid? CreatorId { get; set; } + + public Guid? LastModifierId { get; set; } + + public DateTime? LastModificationTime { get; set; } + + public int OrderNum { get; set; } + public bool State { get; set; } + } +} diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostEntity.cs index 1cdd3bd1..a88457e7 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostEntity.cs @@ -10,7 +10,7 @@ namespace Yi.Framework.Rbac.Domain.Entities /// 岗位表 /// [SugarTable("Post")] - public partial class PostEntity : Entity, ISoftDelete, IAuditedObject, IOrderNum, IState + public class PostEntity : Entity, ISoftDelete, IAuditedObject, IOrderNum, IState { /// diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleDeptEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleDeptEntity.cs index 52720653..9cfbe84b 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleDeptEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleDeptEntity.cs @@ -7,7 +7,7 @@ namespace Yi.Framework.Rbac.Domain.Entities; /// 角色部门关系表 /// [SugarTable("RoleDept")] -public partial class RoleDeptEntity : Entity +public class RoleDeptEntity : Entity { /// /// 主键 diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs index 8c19cbcf..002db1be 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs @@ -1125,6 +1125,75 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds + //通知公告 + MenuEntity notice = new MenuEntity(_guidGenerator.Create()) + { + + MenuName = "通知公告", + PermissionCode = "system:notice:list", + MenuType = MenuTypeEnum.Menu, + Router = "notice", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "system/notice/index", + MenuIcon = "message", + OrderNum = 93, + ParentId = system.Id, + IsDeleted = false + }; + entities.Add(notice); + + MenuEntity noticeQuery = new MenuEntity(_guidGenerator.Create()) + { + + MenuName = "通知查询", + PermissionCode = "system:notice:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = notice.Id, + IsDeleted = false + }; + entities.Add(noticeQuery); + + MenuEntity noticeAdd = new MenuEntity(_guidGenerator.Create()) + { + + MenuName = "通知新增", + PermissionCode = "system:notice:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = notice.Id, + IsDeleted = false + }; + entities.Add(noticeAdd); + + MenuEntity noticeEdit = new MenuEntity(_guidGenerator.Create()) + { + + MenuName = "通知修改", + PermissionCode = "system:notice:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = notice.Id, + IsDeleted = false + }; + entities.Add(noticeEdit); + + MenuEntity noticeRemove = new MenuEntity(_guidGenerator.Create()) + { + + MenuName = "通知删除", + PermissionCode = "system:notice:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = notice.Id, + IsDeleted = false + }; + entities.Add(noticeRemove); + + + //日志管理 MenuEntity log = new MenuEntity(_guidGenerator.Create()) { @@ -1135,7 +1204,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds IsShow = true, IsLink = false, MenuIcon = "log", - OrderNum = 93, + OrderNum = 92, ParentId = system.Id, IsDeleted = false }; diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Properties/launchSettings.json b/Yi.Abp.Net8/src/Yi.Abp.Web/Properties/launchSettings.json index 44097413..8f58fa9b 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/Properties/launchSettings.json +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Properties/launchSettings.json @@ -5,8 +5,8 @@ "launchBrowser": true, "launchUrl": "swagger", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - //"ASPNETCORE_ENVIRONMENT": "Staging" + //"ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_ENVIRONMENT": "Staging" }, "dotnetRunMessages": true, "applicationUrl": "http://localhost:19001" diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db b/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db index bb954120..13e994f3 100644 Binary files a/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db and b/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db differ