更新权限相关实体和仓储，重新生成数据库迁移

src/CellularManagement.Domain/Entities/RolePermission.cs

@@ -15,7 +15,7 @@ public class RolePermission
     /// <summary>
     /// 权限ID
     /// </summary>
-    public int PermissionId { get; private set; }
+    public string PermissionId { get; private set; }
 
     /// <summary>
     /// 创建时间
@@ -37,7 +37,7 @@ public class RolePermission
     /// <summary>
     /// 创建角色权限关联
     /// </summary>
-    public static RolePermission Create(string roleId, int permissionId)
+    public static RolePermission Create(string roleId, string permissionId)
     {
         return new RolePermission
         {

src/CellularManagement.Domain/Repositories/IPermissionRepository.cs

@@ -19,7 +19,7 @@ public interface IPermissionCommandRepository : ICommandRepository<Permission>
     /// <summary>
     /// 删除角色权限
     /// </summary>
-    Task DeleteRolePermissionAsync(string roleId, int permissionId, CancellationToken cancellationToken = default);
+    Task DeleteRolePermissionAsync(string roleId, string permissionId, CancellationToken cancellationToken = default);
 }
 
 /// <summary>

src/CellularManagement.Infrastructure/Migrations/20250429070845_InitialCreate.Designer.cs

@@ -1,203 +0,0 @@
-// <auto-generated />
-using System;
-using CellularManagement.Infrastructure.Context;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace CellularManagement.Infrastructure.Migrations
-{
-    [DbContext(typeof(AppDbContext))]
-    [Migration("20250429070845_InitialCreate")]
-    partial class InitialCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("CellularManagement.Domain.Entities.AppRole", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text")
-                        .HasComment("角色ID，主键");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text")
-                        .HasComment("并发控制戳");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasComment("角色名称");
-
-                    b.Property<string>("NormalizedName")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasComment("标准化角色名称（大写）");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("IX_Roles_Name");
-
-                    b.HasIndex("NormalizedName")
-                        .IsUnique()
-                        .HasDatabaseName("RoleNameIndex");
-
-                    b.ToTable("Roles", null, t =>
-                        {
-                            t.HasComment("角色表");
-                        });
-                });
-
-            modelBuilder.Entity("CellularManagement.Domain.Entities.AppUser", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text")
-                        .HasComment("用户ID，主键");
-
-                    b.Property<int>("AccessFailedCount")
-                        .HasColumnType("integer")
-                        .HasComment("登录失败次数");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text")
-                        .HasComment("并发控制戳");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasComment("电子邮箱");
-
-                    b.Property<bool>("EmailConfirmed")
-                        .HasColumnType("boolean")
-                        .HasComment("邮箱是否已验证");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .HasColumnType("boolean")
-                        .HasComment("是否启用账户锁定");
-
-                    b.Property<DateTimeOffset?>("LockoutEnd")
-                        .HasColumnType("timestamp with time zone")
-                        .HasComment("账户锁定结束时间");
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasComment("标准化电子邮箱（大写）");
-
-                    b.Property<string>("NormalizedUserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasComment("标准化用户名（大写）");
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnType("text")
-                        .HasComment("密码哈希值");
-
-                    b.Property<string>("PhoneNumber")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasComment("电话号码");
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .HasColumnType("boolean")
-                        .HasComment("电话号码是否已验证");
-
-                    b.Property<string>("SecurityStamp")
-                        .HasColumnType("text")
-                        .HasComment("安全戳，用于并发控制");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .HasColumnType("boolean")
-                        .HasComment("是否启用双因素认证");
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasComment("用户名");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Email")
-                        .IsUnique()
-                        .HasDatabaseName("IX_Users_Email");
-
-                    b.HasIndex("NormalizedEmail")
-                        .HasDatabaseName("EmailIndex");
-
-                    b.HasIndex("NormalizedUserName")
-                        .IsUnique()
-                        .HasDatabaseName("UserNameIndex");
-
-                    b.HasIndex("PhoneNumber")
-                        .IsUnique()
-                        .HasDatabaseName("IX_Users_PhoneNumber");
-
-                    b.HasIndex("UserName")
-                        .IsUnique()
-                        .HasDatabaseName("IX_Users_UserName");
-
-                    b.ToTable("Users", null, t =>
-                        {
-                            t.HasComment("用户表");
-                        });
-                });
-
-            modelBuilder.Entity("CellularManagement.Domain.Entities.UserRole", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("RoleId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("UserRoles", null, t =>
-                        {
-                            t.HasComment("用户角色关系表");
-                        });
-                });
-
-            modelBuilder.Entity("CellularManagement.Domain.Entities.UserRole", b =>
-                {
-                    b.HasOne("CellularManagement.Domain.Entities.AppRole", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CellularManagement.Domain.Entities.AppUser", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Role");
-
-                    b.Navigation("User");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/CellularManagement.Infrastructure/Migrations/20250429071554_AddRoleDescription.cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CellularManagement.Infrastructure.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddRoleDescription : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Description",
-                table: "Roles",
-                type: "character varying(500)",
-                maxLength: 500,
-                nullable: true,
-                comment: "角色描述");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Description",
-                table: "Roles");
-        }
-    }
-}

src/CellularManagement.Infrastructure/Migrations/20250429071554_AddRoleDescription.Designer.cs → src/CellularManagement.Infrastructure/Migrations/20250509092443_InitialCreate.Designer.cs

@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace CellularManagement.Infrastructure.Migrations
 {
     [DbContext(typeof(AppDbContext))]
-    [Migration("20250429071554_AddRoleDescription")]
+    [Migration("20250509092443_InitialCreate")]
-    partial class AddRoleDescription
+    partial class InitialCreate
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -166,6 +166,46 @@ namespace CellularManagement.Infrastructure.Migrations
                         });
                 });
 
+            modelBuilder.Entity("CellularManagement.Domain.Entities.Permission", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Permissions", (string)null);
+                });
+
+            modelBuilder.Entity("CellularManagement.Domain.Entities.RolePermission", b =>
+                {
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("RoleId", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("RolePermissions", (string)null);
+                });
+
             modelBuilder.Entity("CellularManagement.Domain.Entities.UserRole", b =>
                 {
                     b.Property<string>("UserId")
@@ -184,6 +224,25 @@ namespace CellularManagement.Infrastructure.Migrations
                         });
                 });
 
+            modelBuilder.Entity("CellularManagement.Domain.Entities.RolePermission", b =>
+                {
+                    b.HasOne("CellularManagement.Domain.Entities.Permission", "Permission")
+                        .WithMany("RolePermissions")
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("CellularManagement.Domain.Entities.AppRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Permission");
+
+                    b.Navigation("Role");
+                });
+
             modelBuilder.Entity("CellularManagement.Domain.Entities.UserRole", b =>
                 {
                     b.HasOne("CellularManagement.Domain.Entities.AppRole", "Role")
@@ -202,6 +261,11 @@ namespace CellularManagement.Infrastructure.Migrations
 
                     b.Navigation("User");
                 });
+
+            modelBuilder.Entity("CellularManagement.Domain.Entities.Permission", b =>
+                {
+                    b.Navigation("RolePermissions");
+                });
 #pragma warning restore 612, 618
         }
     }

src/CellularManagement.Infrastructure/Migrations/20250429070845_InitialCreate.cs → src/CellularManagement.Infrastructure/Migrations/20250509092443_InitialCreate.cs

@@ -11,11 +11,26 @@ namespace CellularManagement.Infrastructure.Migrations
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.CreateTable(
+                name: "Permissions",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    Name = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
+                    Description = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: true),
+                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Permissions", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Roles",
                 columns: table => new
                 {
                     Id = table.Column<string>(type: "text", nullable: false, comment: "角色ID，主键"),
+                    Description = table.Column<string>(type: "character varying(500)", maxLength: 500, nullable: true, comment: "角色描述"),
                     Name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false, comment: "角色名称"),
                     NormalizedName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false, comment: "标准化角色名称（大写）"),
                     ConcurrencyStamp = table.Column<string>(type: "text", nullable: true, comment: "并发控制戳")
@@ -52,6 +67,31 @@ namespace CellularManagement.Infrastructure.Migrations
                 },
                 comment: "用户表");
 
+            migrationBuilder.CreateTable(
+                name: "RolePermissions",
+                columns: table => new
+                {
+                    RoleId = table.Column<string>(type: "text", nullable: false),
+                    PermissionId = table.Column<string>(type: "text", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RolePermissions", x => new { x.RoleId, x.PermissionId });
+                    table.ForeignKey(
+                        name: "FK_RolePermissions_Permissions_PermissionId",
+                        column: x => x.PermissionId,
+                        principalTable: "Permissions",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_RolePermissions_Roles_RoleId",
+                        column: x => x.RoleId,
+                        principalTable: "Roles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
             migrationBuilder.CreateTable(
                 name: "UserRoles",
                 columns: table => new
@@ -77,6 +117,11 @@ namespace CellularManagement.Infrastructure.Migrations
                 },
                 comment: "用户角色关系表");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_RolePermissions_PermissionId",
+                table: "RolePermissions",
+                column: "PermissionId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_Roles_Name",
                 table: "Roles",
@@ -127,9 +172,15 @@ namespace CellularManagement.Infrastructure.Migrations
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropTable(
+                name: "RolePermissions");
+
             migrationBuilder.DropTable(
                 name: "UserRoles");
 
+            migrationBuilder.DropTable(
+                name: "Permissions");
+
             migrationBuilder.DropTable(
                 name: "Roles");
 

src/CellularManagement.Infrastructure/Migrations/AppDbContextModelSnapshot.cs

@@ -163,6 +163,46 @@ namespace CellularManagement.Infrastructure.Migrations
                         });
                 });
 
+            modelBuilder.Entity("CellularManagement.Domain.Entities.Permission", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Permissions", (string)null);
+                });
+
+            modelBuilder.Entity("CellularManagement.Domain.Entities.RolePermission", b =>
+                {
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PermissionId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("RoleId", "PermissionId");
+
+                    b.HasIndex("PermissionId");
+
+                    b.ToTable("RolePermissions", (string)null);
+                });
+
             modelBuilder.Entity("CellularManagement.Domain.Entities.UserRole", b =>
                 {
                     b.Property<string>("UserId")
@@ -181,6 +221,25 @@ namespace CellularManagement.Infrastructure.Migrations
                         });
                 });
 
+            modelBuilder.Entity("CellularManagement.Domain.Entities.RolePermission", b =>
+                {
+                    b.HasOne("CellularManagement.Domain.Entities.Permission", "Permission")
+                        .WithMany("RolePermissions")
+                        .HasForeignKey("PermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("CellularManagement.Domain.Entities.AppRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Permission");
+
+                    b.Navigation("Role");
+                });
+
             modelBuilder.Entity("CellularManagement.Domain.Entities.UserRole", b =>
                 {
                     b.HasOne("CellularManagement.Domain.Entities.AppRole", "Role")
@@ -199,6 +258,11 @@ namespace CellularManagement.Infrastructure.Migrations
 
                     b.Navigation("User");
                 });
+
+            modelBuilder.Entity("CellularManagement.Domain.Entities.Permission", b =>
+                {
+                    b.Navigation("RolePermissions");
+                });
 #pragma warning restore 612, 618
         }
     }

src/CellularManagement.Infrastructure/Repositories/PermissionRepository.cs

@@ -156,7 +156,7 @@ public class PermissionRepository :
     /// <summary>
     /// 删除角色权限
     /// </summary>
-    public async Task DeleteRolePermissionAsync(string roleId, int permissionId, CancellationToken cancellationToken = default)
+    public async Task DeleteRolePermissionAsync(string roleId, string permissionId, CancellationToken cancellationToken = default)
     {
         var rolePermission = await _context.RolePermissions
             .FirstOrDefaultAsync(rp => rp.RoleId == roleId && rp.PermissionId == permissionId, cancellationToken);