feat: 用户管理后端与日志库迁移

2025-12-27 06:23:03 +08:00
parent 0ff2794667
commit b2a90cf8af
57 changed files with 4117 additions and 33 deletions
--- a/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Persistence/EfIdentityUserRepository.cs
+++ b/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Persistence/EfIdentityUserRepository.cs
@@ -32,6 +32,90 @@ public sealed class EfIdentityUserRepository(IdentityDbContext dbContext) : IIde
        return dbContext.IdentityUsers.AnyAsync(x => x.Account == normalized, cancellationToken);
    }

+    /// <summary>
+    /// 判断账号是否存在（租户内，可排除指定用户）。
+    /// </summary>
+    /// <param name="tenantId">租户 ID。</param>
+    /// <param name="account">账号。</param>
+    /// <param name="excludeUserId">排除的用户 ID。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>存在返回 true。</returns>
+    public Task<bool> ExistsByAccountAsync(long tenantId, string account, long? excludeUserId = null, CancellationToken cancellationToken = default)
+    {
+        // 1. 标准化账号
+        var normalized = account.Trim();
+
+        // 2. 构建查询（包含已删除数据）
+        var query = dbContext.IdentityUsers
+            .IgnoreQueryFilters()
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId && x.Account == normalized);
+
+        if (excludeUserId.HasValue)
+        {
+            query = query.Where(x => x.Id != excludeUserId.Value);
+        }
+
+        // 3. 返回是否存在
+        return query.AnyAsync(cancellationToken);
+    }
+
+    /// <summary>
+    /// 判断手机号是否存在（租户内，可排除指定用户）。
+    /// </summary>
+    /// <param name="tenantId">租户 ID。</param>
+    /// <param name="phone">手机号。</param>
+    /// <param name="excludeUserId">排除的用户 ID。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>存在返回 true。</returns>
+    public Task<bool> ExistsByPhoneAsync(long tenantId, string phone, long? excludeUserId = null, CancellationToken cancellationToken = default)
+    {
+        // 1. 标准化手机号
+        var normalized = phone.Trim();
+
+        // 2. 构建查询（包含已删除数据）
+        var query = dbContext.IdentityUsers
+            .IgnoreQueryFilters()
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId && x.Phone == normalized);
+
+        if (excludeUserId.HasValue)
+        {
+            query = query.Where(x => x.Id != excludeUserId.Value);
+        }
+
+        // 3. 返回是否存在
+        return query.AnyAsync(cancellationToken);
+    }
+
+    /// <summary>
+    /// 判断邮箱是否存在（租户内，可排除指定用户）。
+    /// </summary>
+    /// <param name="tenantId">租户 ID。</param>
+    /// <param name="email">邮箱。</param>
+    /// <param name="excludeUserId">排除的用户 ID。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>存在返回 true。</returns>
+    public Task<bool> ExistsByEmailAsync(long tenantId, string email, long? excludeUserId = null, CancellationToken cancellationToken = default)
+    {
+        // 1. 标准化邮箱
+        var normalized = email.Trim();
+
+        // 2. 构建查询（包含已删除数据）
+        var query = dbContext.IdentityUsers
+            .IgnoreQueryFilters()
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId && x.Email == normalized);
+
+        if (excludeUserId.HasValue)
+        {
+            query = query.Where(x => x.Id != excludeUserId.Value);
+        }
+
+        // 3. 返回是否存在
+        return query.AnyAsync(cancellationToken);
+    }
+
    /// <summary>
    /// 根据 ID 获取后台用户。
    /// </summary>
@@ -41,6 +125,19 @@ public sealed class EfIdentityUserRepository(IdentityDbContext dbContext) : IIde
    public Task<IdentityUser?> FindByIdAsync(long userId, CancellationToken cancellationToken = default)
        => dbContext.IdentityUsers.AsNoTracking().FirstOrDefaultAsync(x => x.Id == userId, cancellationToken);

+    /// <summary>
+    /// 根据 ID 获取后台用户（忽略租户过滤器，仅用于只读查询）。
+    /// </summary>
+    /// <param name="userId">用户 ID。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>后台用户或 null。</returns>
+    public Task<IdentityUser?> FindByIdIgnoringTenantAsync(long userId, CancellationToken cancellationToken = default)
+        => dbContext.IdentityUsers
+            .IgnoreQueryFilters()
+            .AsNoTracking()
+            .Where(x => x.DeletedAt == null)
+            .FirstOrDefaultAsync(x => x.Id == userId, cancellationToken);
+
    /// <summary>
    /// 根据 ID 获取后台用户（用于更新，返回可跟踪实体）。
    /// </summary>
@@ -63,6 +160,31 @@ public sealed class EfIdentityUserRepository(IdentityDbContext dbContext) : IIde
            .Where(x => x.DeletedAt == null)
            .FirstOrDefaultAsync(x => x.Id == userId, cancellationToken);

+    /// <summary>
+    /// 根据 ID 获取后台用户（用于更新，包含已删除数据）。
+    /// </summary>
+    /// <param name="tenantId">租户 ID。</param>
+    /// <param name="userId">用户 ID。</param>
+    /// <param name="ignoreTenantFilter">是否忽略租户过滤。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>后台用户或 null。</returns>
+    public Task<IdentityUser?> GetForUpdateIncludingDeletedAsync(
+        long tenantId,
+        long userId,
+        bool ignoreTenantFilter = false,
+        CancellationToken cancellationToken = default)
+    {
+        // 1. 构建查询（包含已删除数据）
+        var query = dbContext.IdentityUsers.IgnoreQueryFilters();
+        if (!ignoreTenantFilter)
+        {
+            query = query.Where(x => x.TenantId == tenantId);
+        }
+
+        // 2. 返回实体
+        return query.FirstOrDefaultAsync(x => x.Id == userId, cancellationToken);
+    }
+
    /// <summary>
    /// 按租户与关键字搜索后台用户（只读）。
    /// </summary>
@@ -88,6 +210,144 @@ public sealed class EfIdentityUserRepository(IdentityDbContext dbContext) : IIde
        return await query.ToListAsync(cancellationToken);
    }

+    /// <summary>
+    /// 分页查询后台用户列表。
+    /// </summary>
+    /// <param name="filter">查询过滤条件。</param>
+    /// <param name="ignoreTenantFilter">是否忽略租户过滤器。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>分页结果。</returns>
+    public async Task<(IReadOnlyList<IdentityUser> Items, int Total)> SearchPagedAsync(
+        IdentityUserSearchFilter filter,
+        bool ignoreTenantFilter = false,
+        CancellationToken cancellationToken = default)
+    {
+        // 1. 构建基础查询
+        var query = dbContext.IdentityUsers.AsNoTracking();
+        if (ignoreTenantFilter || filter.IncludeDeleted)
+        {
+            query = query.IgnoreQueryFilters();
+        }
+
+        // 2. 租户过滤
+        if (!ignoreTenantFilter)
+        {
+            if (filter.TenantId.HasValue && filter.TenantId.Value != 0)
+            {
+                query = query.Where(x => x.TenantId == filter.TenantId.Value);
+            }
+        }
+        else if (filter.TenantId.HasValue && filter.TenantId.Value != 0)
+        {
+            query = query.Where(x => x.TenantId == filter.TenantId.Value);
+        }
+
+        if (!filter.IncludeDeleted)
+        {
+            query = query.Where(x => x.DeletedAt == null);
+        }
+
+        // 3. 关键字筛选
+        if (!string.IsNullOrWhiteSpace(filter.Keyword))
+        {
+            var normalized = filter.Keyword.Trim();
+            var likeValue = $"%{normalized}%";
+            query = query.Where(x =>
+                EF.Functions.ILike(x.Account, likeValue)
+                || EF.Functions.ILike(x.DisplayName, likeValue)
+                || (x.Phone != null && EF.Functions.ILike(x.Phone, likeValue))
+                || (x.Email != null && EF.Functions.ILike(x.Email, likeValue)));
+        }
+
+        // 4. 状态过滤
+        if (filter.Status.HasValue)
+        {
+            query = query.Where(x => x.Status == filter.Status.Value);
+        }
+
+        // 5. 角色过滤
+        if (filter.RoleId.HasValue)
+        {
+            var roleId = filter.RoleId.Value;
+            var userRoles = dbContext.UserRoles.AsNoTracking();
+            if (ignoreTenantFilter || filter.IncludeDeleted)
+            {
+                userRoles = userRoles.IgnoreQueryFilters();
+            }
+
+            if (!ignoreTenantFilter)
+            {
+                if (filter.TenantId.HasValue && filter.TenantId.Value != 0)
+                {
+                    userRoles = userRoles.Where(x => x.TenantId == filter.TenantId.Value);
+                }
+            }
+            else if (filter.TenantId.HasValue && filter.TenantId.Value != 0)
+            {
+                userRoles = userRoles.Where(x => x.TenantId == filter.TenantId.Value);
+            }
+
+            if (!filter.IncludeDeleted)
+            {
+                userRoles = userRoles.Where(x => x.DeletedAt == null);
+            }
+
+            query = query.Where(user => userRoles.Any(role => role.UserId == user.Id && role.RoleId == roleId));
+        }
+
+        // 6. 时间范围过滤
+        if (filter.CreatedAtFrom.HasValue)
+        {
+            query = query.Where(x => x.CreatedAt >= filter.CreatedAtFrom.Value);
+        }
+
+        if (filter.CreatedAtTo.HasValue)
+        {
+            query = query.Where(x => x.CreatedAt <= filter.CreatedAtTo.Value);
+        }
+
+        if (filter.LastLoginFrom.HasValue)
+        {
+            query = query.Where(x => x.LastLoginAt >= filter.LastLoginFrom.Value);
+        }
+
+        if (filter.LastLoginTo.HasValue)
+        {
+            query = query.Where(x => x.LastLoginAt <= filter.LastLoginTo.Value);
+        }
+
+        // 7. 排序
+        var sorted = filter.SortBy?.ToLowerInvariant() switch
+        {
+            "account" => filter.SortDescending
+                ? query.OrderByDescending(x => x.Account)
+                : query.OrderBy(x => x.Account),
+            "displayname" => filter.SortDescending
+                ? query.OrderByDescending(x => x.DisplayName)
+                : query.OrderBy(x => x.DisplayName),
+            "status" => filter.SortDescending
+                ? query.OrderByDescending(x => x.Status)
+                : query.OrderBy(x => x.Status),
+            "lastloginat" => filter.SortDescending
+                ? query.OrderByDescending(x => x.LastLoginAt)
+                : query.OrderBy(x => x.LastLoginAt),
+            _ => filter.SortDescending
+                ? query.OrderByDescending(x => x.CreatedAt)
+                : query.OrderBy(x => x.CreatedAt)
+        };
+
+        // 8. 分页
+        var page = filter.Page <= 0 ? 1 : filter.Page;
+        var pageSize = filter.PageSize <= 0 ? 20 : filter.PageSize;
+        var total = await sorted.CountAsync(cancellationToken);
+        var items = await sorted
+            .Skip((page - 1) * pageSize)
+            .Take(pageSize)
+            .ToListAsync(cancellationToken);
+
+        return (items, total);
+    }
+
    /// <summary>
    /// 根据 ID 集合批量获取后台用户（只读）。
    /// </summary>
@@ -101,6 +361,50 @@ public sealed class EfIdentityUserRepository(IdentityDbContext dbContext) : IIde
            .ToListAsync(cancellationToken)
            .ContinueWith(t => (IReadOnlyList<IdentityUser>)t.Result, cancellationToken);

+    /// <summary>
+    /// 批量获取后台用户（可用于更新，支持包含已删除数据）。
+    /// </summary>
+    /// <param name="tenantId">租户 ID。</param>
+    /// <param name="userIds">用户 ID 集合。</param>
+    /// <param name="includeDeleted">是否包含已删除数据。</param>
+    /// <param name="ignoreTenantFilter">是否忽略租户过滤器。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>后台用户列表。</returns>
+    public Task<IReadOnlyList<IdentityUser>> GetForUpdateByIdsAsync(
+        long tenantId,
+        IEnumerable<long> userIds,
+        bool includeDeleted,
+        bool ignoreTenantFilter = false,
+        CancellationToken cancellationToken = default)
+    {
+        // 1. 构建基础查询
+        var ids = userIds.Distinct().ToArray();
+        if (ids.Length == 0)
+        {
+            return Task.FromResult<IReadOnlyList<IdentityUser>>(Array.Empty<IdentityUser>());
+        }
+
+        var query = dbContext.IdentityUsers.Where(x => ids.Contains(x.Id));
+        if (ignoreTenantFilter || includeDeleted)
+        {
+            query = query.IgnoreQueryFilters();
+        }
+
+        if (!ignoreTenantFilter)
+        {
+            query = query.Where(x => x.TenantId == tenantId);
+        }
+
+        if (!includeDeleted)
+        {
+            query = query.Where(x => x.DeletedAt == null);
+        }
+
+        // 2. 返回列表
+        return query.ToListAsync(cancellationToken)
+            .ContinueWith(t => (IReadOnlyList<IdentityUser>)t.Result, cancellationToken);
+    }
+
    /// <summary>
    /// 新增后台用户。
    /// </summary>
@@ -115,6 +419,20 @@ public sealed class EfIdentityUserRepository(IdentityDbContext dbContext) : IIde
        return Task.CompletedTask;
    }

+    /// <summary>
+    /// 删除后台用户（软删除）。
+    /// </summary>
+    /// <param name="user">后台用户实体。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>异步任务。</returns>
+    public Task RemoveAsync(IdentityUser user, CancellationToken cancellationToken = default)
+    {
+        // 1. 标记删除
+        dbContext.IdentityUsers.Remove(user);
+        // 2. 返回完成任务
+        return Task.CompletedTask;
+    }
+
    /// <summary>
    /// 持久化仓储变更。
    /// </summary>