fix:bug

sunpengfei

2025-08-08 85279c0daafcfea80db14cdd8dfe85f7c7fddba4

 FlexJobApi.Core/Utils/DbUtils/DbUtils.cs

@@ -1,4 +1,5 @@
using Furion;
using Consul.Filtering;
using Furion;
using Furion.DatabaseAccessor;
using Furion.DistributedIDGenerator;
using Furion.FriendlyException;
@@ -7,6 +8,7 @@
using Microsoft.EntityFrameworkCore.ChangeTracking;
using Microsoft.EntityFrameworkCore.Diagnostics;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
using System;
@@ -16,6 +18,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Timers;

namespace FlexJobApi.Core
{
@@ -24,6 +27,105 @@
    /// </summary>
    public static class DbUtils
    {
        /// <summary>
        /// 获取树形数据路径
        /// </summary>
        /// <typeparam name="TEntity"></typeparam>
        /// <param name="parentId"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task<string> GetTreeDataPath<TEntity>(
             Guid? parentId,
            CancellationToken cancellationToken = default)
            where TEntity : CommonEntity, ITreeData<TEntity>, new()
        {
            var rep = Db.GetRepository<TEntity>();
            if (parentId.HasValue)
            {
                var parent = await rep.AsQueryable().AsNoTracking()
                    .Where(it => it.Id == parentId)
                    .Select(it => new
                    {
                        it.Path,
                        it.Code
                    })
                    .FirstOrDefaultAsync(cancellationToken);
                var summary = typeof(TEntity).GetSummary();
                if (parent == null) throw Oops.Oh(EnumErrorCodeType.s404, $"上级{summary}");
                return $"{parent.Path}{parent.Code}/";
            }
            else
            {
                return "/";
            }
        }

        /// <summary>
        /// 更新树形数据下级路径
        /// </summary>
        /// <param name="oldPath"></param>
        /// <param name="newPath"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task UpdateTreeDataChildrenPath<TEntity>(
            string oldPath,
            string newPath,
            CancellationToken cancellationToken)
            where TEntity : CommonEntity, ITreeData<TEntity>, new()
        {
            var rep = Db.GetRepository<TEntity>();
            var models = await rep.AsQueryable()
                .Where(it => it.Path.StartsWith(oldPath))
                .ToListAsync(cancellationToken);
            if (models.IsNotNull())
            {
                foreach (var model in models)
                {
                    model.Path = model.Path.Replace(oldPath, newPath);
                }
                await rep.UpdateAsync(models);
            }
        }

        /// <summary>
        /// 查询选择器数据
        /// </summary>
        /// <typeparam name="TEntity"></typeparam>
        /// <typeparam name="TValue"></typeparam>
        /// <typeparam name="TData"></typeparam>
        /// <param name="request"></param>
        /// <param name="getValue"></param>
        /// <param name="getLabel"></param>
        /// <param name="query"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task<List<SelectOption<TValue, TData>>> GetSelect<TEntity, TValue, TData>(
            this SelectQuery<TValue, TData> request,
            Func<TData, TValue> getValue,
            Func<TData, string> getLabel,
            Func<IQueryable<TEntity>, IQueryable<TEntity>> query = null,
            CancellationToken cancellationToken = default)
            where TEntity : CommonEntity, new()
        {
            var rep = Db.GetRepository<TEntity>();
            var q = rep.AsQueryable().AsNoTracking();
            if (query != null) q = query(q);
            else q = q.OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime);
            var models = await q
                .ProjectToType<TData>()
                .ToListAsync(cancellationToken);
            var options = new List<SelectOption<TValue, TData>>();
            foreach (var model in models)
            {
                var option = new SelectOption<TValue, TData>();
                option.Data = model;
                option.Value = getValue(model);
                option.Label = getLabel(model);
                options.Add(option);
            }
            return options;
        }

        /// <summary>
        /// 查询分页列表数据
        /// </summary>
@@ -34,8 +136,8 @@
        /// <param name="selector"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task<PagedListQueryResult<TItem>> ToPagedListAsync<TEntity, TItem>(
            this PagedListQueryPageModel page, 
        public static async Task<PagedListQueryResult<TItem>> GetPagedListAsync<TEntity, TItem>(
            this PagedListQueryPageModel page,
            Func<IQueryable<TEntity>, IQueryable<TEntity>> query = null,
            Expression<Func<TEntity, TItem>> selector = null,
            CancellationToken cancellationToken = default)
@@ -45,7 +147,8 @@
            var rep = Db.GetRepository<TEntity>();
            var q = rep.AsQueryable().AsNoTracking();
            if (query != null) q = query(q);
            q = q.OrderBy(page.OrderInput);
            else q = q.OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime);
            q = q.CustomOrderBy(page.OrderInput);
            var s = selector == null
                ? q.ProjectToType<TItem>()
                : q.Select(selector);
@@ -59,63 +162,74 @@
        }

        /// <summary>
        /// 排序
        /// 查询分页列表数据
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <typeparam name="TItem"></typeparam>
        /// <param name="page"></param>
        /// <param name="q"></param>
        /// <param name="orders"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static IQueryable<T> OrderBy<T>(this IQueryable<T> q, List<PagedListQueryPageModelOrderInput> orders)
        public static async Task<PagedListQueryResult<TItem>> GetPagedListAsync<TItem>(
            this PagedListQueryPageModel page,
            IQueryable<TItem> q,
            CancellationToken cancellationToken = default)
            where TItem : class, new()
        {
            if (orders.IsNull()) return q;
            q = q.CustomOrderBy(page.OrderInput);
            var pagedList = await q.ToPagedListAsync(page.Page, page.Rows, cancellationToken);
            var result = new PagedListQueryResult<TItem>();
            result.PageModel = page.Adapt<PagedListQueryResultPageModel>();
            result.PageModel.TotalCount = pagedList.TotalCount;
            result.PageModel.TotalPage = pagedList.TotalPages;
            result.Data = pagedList.Items.ToList();
            return result;
        }

            var entityType = typeof(T);
            int index = 0;

            var props = entityType.GetProperties();
            foreach (var order in orders)
        public static IOrderedQueryable<T> CustomOrderBy<T>(this IQueryable<T> q, List<PagedListQueryPageModelOrderInput> orders)
        {
            ParameterExpression parameter = Expression.Parameter(typeof(T), "p");
            PagedListQueryPageModelOrderInput orderInput = orders[0];
            IOrderedQueryable<T> orderedQueryable = (orderInput.Order == EnumPagedListOrder.Asc) 
                ? OrderBy(q, orderInput.Property, parameter) 
                : OrderByDescending(q, orderInput.Property, parameter);
            for (int i = 1; i < orders.Count; i++)
            {
                if (string.IsNullOrEmpty(order.Property)) continue;

                // 获取排序字段的属性信息
                var propertyInfo = props.FirstOrDefault(it => it.Name.Equals(order.Property, StringComparison.OrdinalIgnoreCase));
                if (propertyInfo == null) throw Oops.Oh(EnumErrorCodeType.s404, $"该排序字段{order.Property}");

                // 创建表达式树
                var parameter = Expression.Parameter(entityType, "x");
                var propertyAccess = Expression.Property(parameter, propertyInfo);
                var lambda = Expression.Lambda(propertyAccess, parameter);

                string methodName;
                if (index == 0)
                {
                    // 首次排序
                    methodName = order.Order == EnumPagedListOrder.Asc
                        ? "OrderBy"
                        : "OrderByDescending";
                }
                else
                {
                    // 二次及以后排序
                    methodName = order.Order == EnumPagedListOrder.Asc
                        ? "ThenBy"
                        : "ThenByDescending";
                }

                // 调用相应的排序方法
                var resultExpression = Expression.Call(
                    typeof(Queryable),
                    methodName,
                    [entityType, propertyInfo.PropertyType],
                    q.Expression,
                    Expression.Quote(lambda)
                );

                q = q.Provider.CreateQuery<T>(resultExpression);
                index++;
                PagedListQueryPageModelOrderInput orderInput2 = orders[i];
                orderedQueryable = (orderInput2.Order == EnumPagedListOrder.Asc) 
                    ? ThenBy(orderedQueryable, orderInput2.Property, parameter) 
                    : ThenByDescending(orderedQueryable, orderInput2.Property, parameter);
            }

            return q;
            return orderedQueryable;
        }

        private static IOrderedQueryable<T> Ordering<T>(IQueryable<T> source, ParameterExpression parameter, string propertyName, string methodName)
        {
            Type typeFromHandle = typeof(T);
            MemberExpression memberExpression = Expression.PropertyOrField(parameter, propertyName);
            LambdaExpression expression = Expression.Lambda(memberExpression, parameter);
            MethodCallExpression expression2 = Expression.Call(typeof(Queryable), methodName, [typeFromHandle, memberExpression.Type], source.Expression, Expression.Quote(expression));
            return (IOrderedQueryable<T>)source.Provider.CreateQuery<T>(expression2);
        }

        public static IOrderedQueryable<T> OrderBy<T>(IQueryable<T> source, string propertyName, ParameterExpression parameter)
        {
            return Ordering(source, parameter, propertyName, "OrderBy");
        }

        public static IOrderedQueryable<T> OrderByDescending<T>(IQueryable<T> source, string propertyName, ParameterExpression parameter)
        {
            return Ordering(source, parameter, propertyName, "OrderByDescending");
        }

        public static IOrderedQueryable<T> ThenBy<T>(IOrderedQueryable<T> source, string propertyName, ParameterExpression parameter)
        {
            return Ordering(source, parameter, propertyName, "ThenBy");
        }

        public static IOrderedQueryable<T> ThenByDescending<T>(IOrderedQueryable<T> source, string propertyName, ParameterExpression parameter)
        {
            return Ordering(source, parameter, propertyName, "ThenByDescending");
        }

        /// <summary>
@@ -126,7 +240,10 @@
        /// <param name="query"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task<int> SetIsDisable<TEntity>(this SetIsDisabledCommand request, Func<IQueryable<TEntity>, IQueryable<TEntity>> query = null, CancellationToken cancellationToken = default)
        public static async Task<int> SetIsDisabled<TEntity>(
            this SetIsDisabledCommand request,
            Func<IQueryable<TEntity>, IQueryable<TEntity>> query = null,
            CancellationToken cancellationToken = default)
            where TEntity : CommonEntity, IIsDisabled, new()
        {
            var rep = Db.GetRepository<TEntity>();
@@ -150,7 +267,10 @@
        /// <param name="query"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task<int> DeleteData<TEntity>(this DeleteDataCommand request, Func<IQueryable<TEntity>, IQueryable<TEntity>> query = null, CancellationToken cancellationToken = default)
        public static async Task<int> DeleteData<TEntity>(
            this DeleteDataCommand request, Func<IQueryable<TEntity>,
            IQueryable<TEntity>> query = null,
            CancellationToken cancellationToken = default)
            where TEntity : CommonEntity, new()
        {
            var rep = Db.GetRepository<TEntity>();
@@ -170,30 +290,41 @@
        /// <typeparam name="TEntity"></typeparam>
        /// <typeparam name="TRequest"></typeparam>
        /// <param name="request"></param>
        /// <param name="query"></param>
        /// <param name="checkExist"></param>
        /// <param name="update"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task<Guid> SaveData<TEntity, TRequest>(this TRequest request, Func<IQueryable<TEntity>, TEntity, TRequest, bool> checkExist = null, CancellationToken cancellationToken = default)
        public static async Task<Guid> SaveData<TEntity, TRequest>(
            this TRequest request,
            Func<IQueryable<TEntity>, IQueryable<TEntity>> query = null,
            Expression<Func<TEntity, bool>> checkExist = null,
            Action<TEntity> update = null,
            CancellationToken cancellationToken = default)
            where TEntity : CommonEntity, new()
            where TRequest : SaveDataCommand, new()
        {
            var xmlDoc = await XmlDocUtils.GetXmlDocAsync();
            var summary = await typeof(TEntity).GetSummary(xmlDoc);
            var rep = Db.GetRepository<TEntity>();
            if (checkExist != null && await rep.AsQueryable().AsNoTracking().AnyAsync(checkExist))
                throw Oops.Oh(EnumErrorCodeType.s405, $"该{summary ?? "信息"}");
            if (request.Id.HasValue)
            {
                var entity = await rep.AsQueryable().FirstOrDefaultAsync(it => it.Id == request.Id, cancellationToken);
                var q = rep.AsQueryable();
                if (query != null) q = query(q);
                var entity = await q.FirstOrDefaultAsync(it => it.Id == request.Id, cancellationToken);
                if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, $"该{summary ?? "信息"}");
                if (checkExist != null && checkExist(rep.AsQueryable().AsNoTracking(), entity, request)) throw Oops.Oh(EnumErrorCodeType.s405, $"该{summary ?? "信息"}");
                request.Adapt(entity);
                if (update != null) update(entity);
                else request.Adapt(entity);
                await rep.UpdateAsync(entity);
                return entity.Id;
            }
            else
            {
                var entity = new TEntity();
                if (checkExist != null && checkExist(rep.AsQueryable().AsNoTracking(), entity, request)) throw Oops.Oh(EnumErrorCodeType.s405, $"该{summary ?? "信息"}");
                request.Adapt(entity);
                if (update != null) update(entity);
                else request.Adapt(entity);
                await rep.InsertAsync(entity);
                return entity.Id;
            }
@@ -207,35 +338,41 @@
        /// <returns></returns>
        public static async Task BuildEntity(ModelBuilder modelBuilder, Type dbContextLocator = null)
        {
            var xmlDoc = await XmlDocUtils.GetXmlDocAsync();
            foreach (var entityType in modelBuilder.Model.GetEntityTypes())
            if (App.GetService<IMigrator>() != null)
            {
                Console.WriteLine($"正在生成表：{entityType.Name}");
                // 获取实体类的XML注释，并设置为表注释
                var entityBuilder = modelBuilder.Entity(entityType.ClrType);
                string typeComment = (await entityType.ClrType.GetXmlDocMemberAsync(xmlDoc))?.Summary;
                if (!string.IsNullOrEmpty(typeComment))
                var xmlDoc = await XmlDocUtils.GetXmlDocAsync();
                foreach (var entityType in modelBuilder.Model.GetEntityTypes())
                {
                    Console.WriteLine($"正在生成表注释：{entityType.Name}-{typeComment}");
                    entityBuilder.ToTable(it => it.HasComment(typeComment));
                }
                // 获取实体属性的XML注释，并设置为列注释
                var properties = entityType.ClrType.GetProperties()
                    .Where(p =>
                        p.CanRead
                        && p.CanWrite
                        && !typeof(System.Collections.ICollection).IsAssignableFrom(p.PropertyType)
                        && (p.PropertyType.IsClass ? p.PropertyType.FullName.Contains("System.") : true));
                foreach (var property in properties)
                {
                    string propComment = (await property.GetXmlDocMemberAsync(xmlDoc))?.Summary;
                    if (!string.IsNullOrEmpty(propComment))
                    Console.WriteLine($"正在生成表：{entityType.Name}");
                    // 获取实体类的XML注释，并设置为表注释
                    var entityBuilder = modelBuilder.Entity(entityType.ClrType);
                    string typeComment = (await entityType.ClrType.GetXmlDocMemberAsync(xmlDoc))?.Summary;
                    if (!string.IsNullOrEmpty(typeComment))
                    {
                        Console.WriteLine($"正在生成属性注释：{property.Name}-{propComment}");
                        entityBuilder.Property(property.Name).HasComment(propComment);
                        Console.WriteLine($"正在生成表注释：{entityType.Name}-{typeComment}");
                        entityBuilder.ToTable(it => it.HasComment(typeComment));
                    }
                    // 获取实体属性的XML注释，并设置为列注释
                    var properties = entityType.ClrType.GetProperties()
                        .Where(p =>
                            p.CanRead
                            && p.CanWrite
                            && !typeof(System.Collections.ICollection).IsAssignableFrom(p.PropertyType)
                            && (p.PropertyType.IsClass ? p.PropertyType.FullName.Contains("System.") : true));
                    foreach (var property in properties)
                    {
                        string propComment = (await property.GetXmlDocMemberAsync(xmlDoc))?.Summary;
                        if (!string.IsNullOrEmpty(propComment))
                        {
                            Console.WriteLine($"正在生成属性注释：{property.Name}-{propComment}");
                            entityBuilder.Property(property.Name).HasComment(propComment);
                        }
                    }
                }
            }

            foreach (var entityType in modelBuilder.Model.GetEntityTypes())
            {
                if (typeof(CommonEntity).IsAssignableFrom(entityType.ClrType))
                {
                    // 构建筛选条件：IsDeleted == false
@@ -249,8 +386,6 @@
                    modelBuilder.Entity(entityType.ClrType).HasQueryFilter(lambda);
                }
            }

            Console.WriteLine("数据库链接地址：" + App.Configuration.GetConnectionString("FlexJobApi"));
        }

        /// <summary>
@@ -279,6 +414,7 @@

            // 通过请求中获取当前操作人
            var logier = JwtUtils.GetCurrentLogier();
            var traceId = App.GetTraceId();

            // 获取所有已更改的实体
            foreach (var entity in entities)
@@ -304,17 +440,24 @@
                    }

                    // 赋值用户信息Id
                    prop = entity.Property(nameof(CommonEntity.CreatedUserInfoId));
                    prop = entity.Property(nameof(CommonEntity.CreatedUserId));
                    if (prop != null && prop.CurrentValue == null)
                    {
                        prop.CurrentValue = logier?.UserInfoId;
                        prop.CurrentValue = logier?.Id;
                    }

                    // 赋值企业Id
                    prop = entity.Property(nameof(CommonEntity.CreatedEnterpriseId));
                    if (prop != null && prop.CurrentValue == null)
                    {
                        prop.CurrentValue = logier?.EnterpriseId;
                    }

                    // 赋值跟踪Id
                    prop = entity.Property(nameof(CommonEntity.TraceId));
                    if (prop != null)
                    if (prop != null && prop.CurrentValue == null && traceId.IsNotNull())
                    {
                        prop.CurrentValue = App.GetTraceId();
                        prop.CurrentValue = traceId;
                    }
                }
                else
@@ -327,17 +470,17 @@
                    }

                    // 赋值用户信息Id
                    prop = entity.Property(nameof(CommonEntity.UpdatedUserInfoId));
                    prop = entity.Property(nameof(CommonEntity.UpdatedUserId));
                    if (prop != null)
                    {
                        prop.CurrentValue = logier?.UserInfoId;
                        prop.CurrentValue = logier?.Id;
                    }

                    // 赋值跟踪Id
                    prop = entity.Property(nameof(CommonEntity.TraceId));
                    if (prop != null)
                    if (prop != null && traceId.IsNotNull())
                    {
                        prop.CurrentValue = App.GetTraceId();
                        prop.CurrentValue = traceId;
                    }

                    // 软删除
@@ -376,7 +519,8 @@
                        : EnumDbAuditOperate.Deleted,
                    TraceId = App.GetTraceId(),
                    CreatedTime = DateTime.Now,
                    CreatedUserInfoId = logier?.UserInfoId,
                    CreatedUserId = logier?.Id,
                    CreatedEnterpriseId = logier?.EnterpriseId
                });
            }
        }