From c8b6903d85e7ceef504a198b4bdfc6b72a73fe19 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 08 八月 2025 13:29:47 +0800
Subject: [PATCH] fix:bug
---
FlexJobApi.Core/Utils/DbUtils/DbUtils.cs | 100 +++++++++++++++++++++++++++++--------------------
1 files changed, 59 insertions(+), 41 deletions(-)
diff --git a/FlexJobApi.Core/Utils/DbUtils/DbUtils.cs b/FlexJobApi.Core/Utils/DbUtils/DbUtils.cs
index e37e10c..b770ec5 100644
--- a/FlexJobApi.Core/Utils/DbUtils/DbUtils.cs
+++ b/FlexJobApi.Core/Utils/DbUtils/DbUtils.cs
@@ -8,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;
@@ -98,7 +99,7 @@
/// <param name="query"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public static async Task<List<SelectQueryResultOption<TValue, TData>>> GetSelect<TEntity, TValue, TData>(
+ 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,
@@ -113,10 +114,10 @@
var models = await q
.ProjectToType<TData>()
.ToListAsync(cancellationToken);
- var options = new List<SelectQueryResultOption<TValue, TData>>();
+ var options = new List<SelectOption<TValue, TData>>();
foreach (var model in models)
{
- var option = new SelectQueryResultOption<TValue, TData>();
+ var option = new SelectOption<TValue, TData>();
option.Data = model;
option.Value = getValue(model);
option.Label = getLabel(model);
@@ -147,7 +148,7 @@
var q = rep.AsQueryable().AsNoTracking();
if (query != null) q = query(q);
else q = q.OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime);
- q = q.OrderBy(page.OrderInput);
+ q = q.CustomOrderBy(page.OrderInput);
var s = selector == null
? q.ProjectToType<TItem>()
: q.Select(selector);
@@ -174,7 +175,7 @@
CancellationToken cancellationToken = default)
where TItem : class, new()
{
- q = q.OrderBy(page.OrderInput);
+ //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>();
@@ -191,7 +192,7 @@
/// <param name="q"></param>
/// <param name="orders"></param>
/// <returns></returns>
- public static IQueryable<T> OrderBy<T>(
+ public static IQueryable<T> CustomOrderBy<T>(
this IQueryable<T> q,
List<PagedListQueryPageModelOrderInput> orders)
{
@@ -304,12 +305,14 @@
/// <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>, IQueryable<TEntity>> query = null,
Expression<Func<TEntity, bool>> checkExist = null,
Action<TEntity> update = null,
CancellationToken cancellationToken = default)
@@ -323,7 +326,9 @@
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 (update != null) update(entity);
else request.Adapt(entity);
@@ -348,35 +353,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
@@ -390,8 +401,6 @@
modelBuilder.Entity(entityType.ClrType).HasQueryFilter(lambda);
}
}
-
- Console.WriteLine("鏁版嵁搴撻摼鎺ュ湴鍧�锛�" + App.Configuration.GetConnectionString("FlexJobApi"));
}
/// <summary>
@@ -420,6 +429,7 @@
// 閫氳繃璇锋眰涓幏鍙栧綋鍓嶆搷浣滀汉
var logier = JwtUtils.GetCurrentLogier();
+ var traceId = App.GetTraceId();
// 鑾峰彇鎵�鏈夊凡鏇存敼鐨勫疄浣�
foreach (var entity in entities)
@@ -445,17 +455,24 @@
}
// 璧嬪�肩敤鎴蜂俊鎭疘d
- 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;
+ }
+
+ // 璧嬪�间紒涓欼d
+ prop = entity.Property(nameof(CommonEntity.CreatedEnterpriseId));
+ if (prop != null && prop.CurrentValue == null)
+ {
+ prop.CurrentValue = logier?.EnterpriseId;
}
// 璧嬪�艰窡韪狪d
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
@@ -468,17 +485,17 @@
}
// 璧嬪�肩敤鎴蜂俊鎭疘d
- prop = entity.Property(nameof(CommonEntity.UpdatedUserInfoId));
+ prop = entity.Property(nameof(CommonEntity.UpdatedUserId));
if (prop != null)
{
- prop.CurrentValue = logier?.UserInfoId;
+ prop.CurrentValue = logier?.Id;
}
// 璧嬪�艰窡韪狪d
prop = entity.Property(nameof(CommonEntity.TraceId));
- if (prop != null)
+ if (prop != null && traceId.IsNotNull())
{
- prop.CurrentValue = App.GetTraceId();
+ prop.CurrentValue = traceId;
}
// 杞垹闄�
@@ -517,7 +534,8 @@
: EnumDbAuditOperate.Deleted,
TraceId = App.GetTraceId(),
CreatedTime = DateTime.Now,
- CreatedUserInfoId = logier?.UserInfoId,
+ CreatedUserId = logier?.Id,
+ CreatedEnterpriseId = logier?.EnterpriseId
});
}
}
--
Gitblit v1.9.1