refactor: ♻️ 基础框架的实体更新逻辑 (#137)

Co-authored-by: tk <fiyne1a@dingtalk.com>

src/backend/NetAdmin.Domain/DbMaps/Dependency/EntityBase.cs

@@ -3,4 +3,11 @@ namespace NetAdmin.Domain.DbMaps.Dependency;
 /// <summary>
 ///     数据库实体基类
 /// </summary>
-public abstract record EntityBase : DataAbstraction;
+public abstract record EntityBase<T> : DataAbstraction
+    where T : IEquatable<T>
+{
+    /// <summary>
+    ///     唯一编码
+    /// </summary>
+    public virtual T Id { get; init; }
+}

src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldPrimary.cs

@@ -1,12 +0,0 @@
-namespace NetAdmin.Domain.DbMaps.Dependency.Fields;
-
-/// <summary>
-///     主键字段接口
-/// </summary>
-public interface IFieldPrimary<T>
-{
-    /// <summary>
-    ///     唯一编码
-    /// </summary>
-    T Id { get; init; }
-}

src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs

@@ -6,7 +6,7 @@ namespace NetAdmin.Domain.DbMaps.Dependency;
 /// <inheritdoc />
 public abstract record ImmutableEntity : ImmutableEntity<long>
 {
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     [Snowflake]
     public override long Id { get; init; }
@@ -17,6 +17,7 @@ public abstract record ImmutableEntity : ImmutableEntity<long>
 /// </summary>
 /// <typeparam name="T">主键类型</typeparam>
 public abstract record ImmutableEntity<T> : LiteImmutableEntity<T>, IFieldCreatedUser
+    where T : IEquatable<T>
 {
     /// <inheritdoc cref="IFieldCreatedUser.CreatedUserId" />
     [Column(CanUpdate = false, Position = -1)]
@@ -28,7 +29,7 @@ public abstract record ImmutableEntity<T> : LiteImmutableEntity<T>, IFieldCreate
     [JsonIgnore]
     public virtual string CreatedUserName { get; init; }
 
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     public override T Id { get; init; }
 }

src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs

@@ -6,7 +6,7 @@ namespace NetAdmin.Domain.DbMaps.Dependency;
 /// <inheritdoc />
 public abstract record LiteImmutableEntity : LiteImmutableEntity<long>
 {
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     [Snowflake]
     public override long Id { get; init; }
@@ -16,15 +16,16 @@ public abstract record LiteImmutableEntity : LiteImmutableEntity<long>
 ///     轻型不可变实体
 /// </summary>
 /// <typeparam name="T">主键类型</typeparam>
-public abstract record LiteImmutableEntity<T> : EntityBase, IFieldPrimary<T>, IFieldCreatedTime
+public abstract record LiteImmutableEntity<T> : EntityBase<T>, IFieldCreatedTime
+    where T : IEquatable<T>
 {
     /// <inheritdoc cref="IFieldCreatedTime.CreatedTime" />
     [Column(ServerTime = DateTimeKind.Local, CanUpdate = false, Position = -1)]
     [JsonIgnore]
     public virtual DateTime CreatedTime { get; init; }
 
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     [JsonIgnore]
-    public virtual T Id { get; init; }
+    public override T Id { get; init; }
 }

src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs

@@ -6,7 +6,7 @@ namespace NetAdmin.Domain.DbMaps.Dependency;
 /// <inheritdoc />
 public abstract record LiteMutableEntity : LiteMutableEntity<long>
 {
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     [Snowflake]
     public override long Id { get; init; }
@@ -16,8 +16,9 @@ public abstract record LiteMutableEntity : LiteMutableEntity<long>
 ///     轻型可变实体
 /// </summary>
 public abstract record LiteMutableEntity<T> : LiteImmutableEntity<T>, IFieldModifiedTime
+    where T : IEquatable<T>
 {
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     public override T Id { get; init; }
 

src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs

@@ -6,7 +6,7 @@ namespace NetAdmin.Domain.DbMaps.Dependency;
 /// <inheritdoc />
 public abstract record LiteVersionEntity : LiteVersionEntity<long>
 {
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     [Snowflake]
     public override long Id { get; init; }
@@ -16,8 +16,9 @@ public abstract record LiteVersionEntity : LiteVersionEntity<long>
 ///     乐观锁轻型可变实体
 /// </summary>
 public abstract record LiteVersionEntity<T> : LiteMutableEntity<T>, IFieldVersion
+    where T : IEquatable<T>
 {
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     public override T Id { get; init; }
 

src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs

@@ -6,7 +6,7 @@ namespace NetAdmin.Domain.DbMaps.Dependency;
 /// <inheritdoc />
 public abstract record MutableEntity : MutableEntity<long>
 {
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     [Snowflake]
     public override long Id { get; init; }
@@ -16,8 +16,9 @@ public abstract record MutableEntity : MutableEntity<long>
 ///     可变实体
 /// </summary>
 public abstract record MutableEntity<T> : LiteMutableEntity<T>, IFieldModifiedUser
+    where T : IEquatable<T>
 {
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     public override T Id { get; init; }
 

src/backend/NetAdmin.Domain/DbMaps/Dependency/SimpleEntity.cs

@@ -3,4 +3,5 @@ namespace NetAdmin.Domain.DbMaps.Dependency;
 /// <summary>
 ///     简单实体
 /// </summary>
-public abstract record SimpleEntity : EntityBase;
+public abstract record SimpleEntity<T> : EntityBase<T>
+    where T : IEquatable<T>;

src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs

@@ -6,7 +6,7 @@ namespace NetAdmin.Domain.DbMaps.Dependency;
 /// <inheritdoc />
 public abstract record VersionEntity : VersionEntity<long>
 {
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     [Snowflake]
     public override long Id { get; init; }
@@ -16,6 +16,7 @@ public abstract record VersionEntity : VersionEntity<long>
 ///     乐观锁可变实体
 /// </summary>
 public abstract record VersionEntity<T> : LiteVersionEntity<T>, IFieldModifiedUser, IFieldCreatedUser
+    where T : IEquatable<T>
 {
     /// <inheritdoc />
     [Column(CanUpdate = false, Position = -1)]
@@ -27,7 +28,7 @@ public abstract record VersionEntity<T> : LiteVersionEntity<T>, IFieldModifiedUs
     [JsonIgnore]
     public virtual string CreatedUserName { get; init; }
 
-    /// <inheritdoc cref="IFieldPrimary{T}.Id" />
+    /// <inheritdoc cref="EntityBase{T}.Id" />
     [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
     public override T Id { get; init; }