feat(upms): 添加诸多实体,准备完成 upms 功能

main
NoahLan 10 months ago
parent 5a23d6f145
commit 8fe06ee495

@ -0,0 +1,41 @@
using SqlSugar;
using Volo.Abp.Auditing;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
namespace NPin.Framework.Upms.Domain.Entities;
[SugarTable("File", "文件信息表")]
public class FileAggregateRoot : AggregateRoot<Guid>, IAuditedObject
{
[SugarColumn(IsPrimaryKey = true, ColumnDescription = "主键")]
public override Guid Id { get; protected set; }
[SugarColumn(ColumnDescription = "文件大小")]
public decimal FileSize { get; set; }
[SugarColumn(ColumnDescription = "文件名称")]
public string FileName { get; set; }
[SugarColumn(ColumnDescription = "文件后缀")]
public string FileExt { get; set; }
[SugarColumn(ColumnDescription = "文件路径")]
public string FilePath { get; set; }
public DateTime CreationTime { get; }
public Guid? CreatorId { get; }
public DateTime? LastModificationTime { get; }
public Guid? LastModifierId { get; }
[SugarColumn(IsIgnore = true)] public override ExtraPropertyDictionary ExtraProperties { get; protected set; }
public FileAggregateRoot()
{
}
public FileAggregateRoot(Guid id) : base(id)
{
Id = id;
}
}

@ -0,0 +1,46 @@
using NPin.Framework.SqlSugarCore.Abstractions.Data;
using SqlSugar;
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities;
namespace NPin.Framework.Upms.Domain.Entities;
[SugarTable("Organization", "组织机构表")]
public class OrganizationEntity : Entity<Guid>, ISoftDelete, IAuditedObject, IOrderNum, IEnabled
{
[SugarColumn(IsPrimaryKey = true, ColumnDescription = "主键")]
public override Guid Id { get; protected set; }
[SugarColumn(ColumnDescription = "组织机构名称")]
public string Name { get; set; } = string.Empty;
[SugarColumn(ColumnDescription = "组织机构编码")]
public string Code { get; set; } = string.Empty;
[SugarColumn(ColumnDescription = "描述")]
public string? Remark { get; set; }
/// <summary>
/// 负责人ID
/// </summary>
public Guid LeaderId { get; set; }
/// <summary>
/// 负责人名称,仅用户展示,不存储
/// </summary>
[SugarColumn(IsIgnore = true)]
public string Leader { get; set; }
/// <summary>
/// 父节点 ID
/// </summary>
public Guid ParentId { get; set; }
public bool IsDeleted { get; }
public DateTime CreationTime { get; } = DateTime.Now;
public Guid? CreatorId { get; }
public DateTime? LastModificationTime { get; }
public Guid? LastModifierId { get; }
public int OrderNum { get; set; }
public bool IsEnabled { get; set; }
}

@ -0,0 +1,30 @@
using NPin.Framework.SqlSugarCore.Abstractions.Data;
using SqlSugar;
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities;
namespace NPin.Framework.Upms.Domain.Entities;
[SugarTable("Post", "岗位表")]
public class PostEntity : Entity<Guid>, ISoftDelete, IAuditedObject, IOrderNum, IEnabled
{
[SugarColumn(IsPrimaryKey = true, ColumnDescription = "主键")]
public override Guid Id { get; protected set; }
[SugarColumn(ColumnDescription = "岗位编码")]
public string Code { get; set; } = string.Empty;
[SugarColumn(ColumnDescription = "岗位名称")]
public string Name { get; set; } = string.Empty;
[SugarColumn(ColumnDescription = "岗位描述")]
public string? Remark { get; set; }
public bool IsDeleted { get; }
public DateTime CreationTime { get; } = DateTime.Now;
public Guid? CreatorId { get; }
public DateTime? LastModificationTime { get; }
public Guid? LastModifierId { get; }
public int OrderNum { get; set; }
public bool IsEnabled { get; set; }
}

@ -0,0 +1,34 @@
using NPin.Framework.SqlSugarCore.Abstractions.Data;
using NPin.Framework.Upms.Domain.Shared.Enums;
using SqlSugar;
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities;
namespace NPin.Framework.Upms.Domain.Entities;
[SugarTable("Role", "角色表")]
public class RoleEntity : Entity<Guid>, ISoftDelete, IAuditedObject, IOrderNum, IEnabled
{
[SugarColumn(IsPrimaryKey = true, ColumnDescription = "主键")]
public override Guid Id { get; protected set; }
[SugarColumn(ColumnDescription = "角色代码")]
public string Code { get; set; } = string.Empty;
[SugarColumn(ColumnDescription = "角色名称")]
public string Name { get; set; } = string.Empty;
[SugarColumn(ColumnDescription = "角色数据权限范围")]
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.All;
[SugarColumn(ColumnDescription = "描述")]
public string? Remark { get; set; }
public bool IsDeleted { get; }
public DateTime CreationTime { get; } = DateTime.Now;
public Guid? CreatorId { get; }
public DateTime? LastModificationTime { get; }
public Guid? LastModifierId { get; }
public int OrderNum { get; set; }
public bool IsEnabled { get; set; }
}

@ -1,4 +1,4 @@
using Microsoft.Win32.SafeHandles; using NPin.Framework.Core.Crypt.BCrypt;
using NPin.Framework.SqlSugarCore.Abstractions.Data; using NPin.Framework.SqlSugarCore.Abstractions.Data;
using NPin.Framework.Upms.Domain.Shared.Enums; using NPin.Framework.Upms.Domain.Shared.Enums;
using SqlSugar; using SqlSugar;
@ -7,7 +7,7 @@ using Volo.Abp.Domain.Entities;
namespace NPin.Framework.Upms.Domain.Entities; namespace NPin.Framework.Upms.Domain.Entities;
[SugarTable("User")] [SugarTable("User", "用户表")]
public class UserEntity : Entity<Guid>, ISoftDelete, IAuditedObject, IEnabled, IOrderNum public class UserEntity : Entity<Guid>, ISoftDelete, IAuditedObject, IEnabled, IOrderNum
{ {
#region User #region User
@ -29,6 +29,9 @@ public class UserEntity : Entity<Guid>, ISoftDelete, IAuditedObject, IEnabled, I
[SugarColumn(ColumnDescription = "密码")] [SugarColumn(ColumnDescription = "密码")]
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
[SugarColumn(ColumnDescription = "密码加盐值")]
public string Salt { get; set; } = string.Empty;
[SugarColumn(ColumnDescription = "简介")] [SugarColumn(ColumnDescription = "简介")]
public string? Introduction { get; set; } public string? Introduction { get; set; }
@ -50,7 +53,7 @@ public class UserEntity : Entity<Guid>, ISoftDelete, IAuditedObject, IEnabled, I
/// </summary> /// </summary>
public bool IsDeleted { get; } public bool IsDeleted { get; }
public DateTime CreationTime { get; } public DateTime CreationTime { get; } = DateTime.Now;
public Guid? CreatorId { get; } public Guid? CreatorId { get; }
public DateTime? LastModificationTime { get; } public DateTime? LastModificationTime { get; }
public Guid? LastModifierId { get; } public Guid? LastModifierId { get; }
@ -66,6 +69,29 @@ public class UserEntity : Entity<Guid>, ISoftDelete, IAuditedObject, IEnabled, I
#region 关联关系(导航) #region 关联关系(导航)
/// <summary>
/// 用户元数据,保存可扩展数据
/// 这里不使用Json的原因是有些库不是很好支持
/// </summary>
[Navigate(NavigateType.OneToMany, nameof(UserMetaEntity.UserId))]
public List<UserMetaEntity> Metadata { get; set; }
/// <summary>
/// 角色列表,多对多
/// </summary>
[Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.UserId), nameof(UserRoleEntity.RoleId))]
public List<RoleEntity> Roles { get; set; }
/// <summary>
/// 岗位列表,多对多
/// </summary>
[Navigate(typeof(UserPostEntity), nameof(UserPostEntity.UserId), nameof(UserPostEntity.PostId))]
public List<PostEntity> Posts { get; set; }
[Navigate(typeof(UserOrganizationEntity), nameof(UserOrganizationEntity.UserId),
nameof(UserOrganizationEntity.OrganizationId))]
public List<OrganizationEntity> Organizations { get; set; }
#endregion #endregion
public UserEntity() public UserEntity()
@ -80,9 +106,50 @@ public class UserEntity : Entity<Guid>, ISoftDelete, IAuditedObject, IEnabled, I
{ {
username = $"用户{phoneNumber}"; username = $"用户{phoneNumber}";
} }
Nickname = nickname.IsNullOrWhiteSpace() ? username : nickname; Nickname = nickname.IsNullOrWhiteSpace() ? username : nickname;
EncryptPassword(password);
// Password }
// SafeNCryptHandle
/// <summary>
/// 通过随机盐值给密码加密使用BCrypt算法
/// </summary>
/// <param name="password"></param>
/// <returns></returns>
/// <exception cref="ArgumentNullException"></exception>
public UserEntity EncryptPassword(string? password)
{
// 若传入密码无值则使用原本Password
// 若原本Password依然无值则抛出参数异常
if (password == null)
{
if (Password.IsNullOrEmpty())
{
throw new ArgumentNullException(nameof(Password));
}
password = Password;
}
Salt = BCrypt.GenerateSalt();
Password = BCrypt.Generate(password, Salt, 0).ToString()!;
return this;
}
/// <summary>
/// 检查密码是否一致
/// </summary>
/// <param name="password"></param>
/// <returns></returns>
/// <exception cref="ArgumentNullException"></exception>
public bool CheckPassword(string password)
{
if (Salt is null)
{
throw new ArgumentNullException(nameof(Salt));
}
return BCrypt.Check(Password, password, Salt, 0);
} }
} }

@ -0,0 +1,24 @@
using SqlSugar;
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities;
namespace NPin.Framework.Upms.Domain.Entities;
[SugarTable("UserMetadata", "用户元数据表")]
public class UserMetaEntity : Entity<Guid>, IAuditedObject
{
[SugarColumn(IsPrimaryKey = true)] public override Guid Id { get; protected set; }
public Guid UserId;
[SugarColumn(ColumnDescription = "元数据 键")]
public string Key { get; set; }
[SugarColumn(ColumnDescription = "元数据 值")]
public string Value { get; set; }
public DateTime CreationTime { get; }
public Guid? CreatorId { get; }
public DateTime? LastModificationTime { get; }
public Guid? LastModifierId { get; }
}

@ -0,0 +1,16 @@
using SqlSugar;
using Volo.Abp.Domain.Entities;
namespace NPin.Framework.Upms.Domain.Entities;
[SugarTable("RelUserOrganization", "用户-组织机构 关系表")]
public class UserOrganizationEntity : Entity<Guid>
{
[SugarColumn(IsPrimaryKey = true)] public override Guid Id { get; protected set; }
[SugarColumn(ColumnDescription = "用户ID")]
public Guid UserId { get; set; }
[SugarColumn(ColumnDescription = "组织机构ID")]
public Guid OrganizationId { get; set; }
}

@ -0,0 +1,17 @@
using SqlSugar;
using Volo.Abp.Domain.Entities;
namespace NPin.Framework.Upms.Domain.Entities;
[SugarTable("RelUserPost","用户-岗位 关系表")]
public class UserPostEntity: Entity<Guid>
{
[SugarColumn(IsPrimaryKey = true)]
public override Guid Id { get; protected set; }
[SugarColumn(ColumnDescription = "用户ID")]
public Guid UserId { get; set; }
[SugarColumn(ColumnDescription = "岗位ID")]
public Guid PostId { get; set; }
}

@ -0,0 +1,17 @@
using SqlSugar;
using Volo.Abp.Domain.Entities;
namespace NPin.Framework.Upms.Domain.Entities;
[SugarTable("RelUserRole", "用户-角色 关系表")]
public class UserRoleEntity: Entity<Guid>
{
[SugarColumn(IsPrimaryKey = true, ColumnDescription = "主键")]
public override Guid Id { get; protected set; }
[SugarColumn(ColumnDescription = "角色ID")]
public Guid RoleId { get; set; }
[SugarColumn(ColumnDescription = "用户ID")]
public Guid UserId { get; set; }
}
Loading…
Cancel
Save