From 3e2476dd75df774d681c2d52d8c1467d62ef9d8a Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 25 Aug 2025 14:24:14 +0800 Subject: [PATCH] Update nav --- .../QueryableProvider/NavigatManager.cs | 121 ++++++++++++++++++ Src/Asp.NetCore2/SqlSugar/Enum/NavigatType.cs | 3 +- 2 files changed, 123 insertions(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs index a02dade9a..e70b5a656 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs @@ -177,6 +177,13 @@ namespace SqlSugar OneToMany(pageList, selector, listItemEntity, navObjectNamePropety, navObjectNameColumnInfo); }); } + else if (navObjectNameColumnInfo.Navigat.NavigatType == NavigateType.OneToManyByArrayList) + { + this.Context.Utilities.PageEach(list, 5000, pageList => + { + OneToManyByArrayList(pageList, selector, listItemEntity, navObjectNamePropety, navObjectNameColumnInfo); + }); + } else if (navObjectNameColumnInfo.Navigat.NavigatType == NavigateType.ManyToOne) { this.Context.Utilities.PageEach(list, 5000, pageList => @@ -531,6 +538,120 @@ namespace SqlSugar } } } + private void OneToManyByArrayList(List list, Func, List> selector, EntityInfo listItemEntity, System.Reflection.PropertyInfo navObjectNamePropety, EntityColumnInfo navObjectNameColumnInfo) + { + Check.ExceptionEasy(!navObjectNameColumnInfo.PropertyInfo.PropertyType.GetGenericArguments().Any(), navObjectNamePropety?.Name + "Navigation configuration error one to many should be List", navObjectNamePropety?.Name + "导航配置错误一对多应该是List"); + + var navEntity = navObjectNameColumnInfo.PropertyInfo.PropertyType.GetGenericArguments()[0]; + var navEntityInfo = this.Context.EntityMaintenance.GetEntityInfo(navEntity); + var childDb = this.Context; + childDb = GetCrossDatabase(childDb, navEntityInfo.Type); + childDb.InitMappingInfo(navEntityInfo.Type); + var navColumn = listItemEntity.Columns.FirstOrDefault(it => it.PropertyName == navObjectNameColumnInfo.Navigat.Name); + Check.ExceptionEasy(navColumn == null, $"{navEntityInfo.EntityName} not found {navObjectNameColumnInfo.Navigat.Name} ", $"实体 {navEntityInfo.EntityName} 未找到导航配置列 {navObjectNameColumnInfo.Navigat.Name} "); + Check.ExceptionEasy(navColumn.IsJson==false&&navColumn.IsArray==false, $"Entity {navEntityInfo.EntityName} navigation configuration errors {navObjectNameColumnInfo.Navigat.Name}, needs to array and IsJson = true or Pgsql IsArray = true ", $"实体 {navEntityInfo.EntityName} 导航配置错误 {navObjectNameColumnInfo.Navigat.Name} ，需要IsJson=true的数组或者pgsql如果是数组类型用 IsArray=true"); + //var navType = navObjectNamePropety.PropertyType; + var listItemPkColumn = navEntityInfo.Columns.Where(it => it.IsPrimarykey).FirstOrDefault(); + Check.ExceptionEasy(listItemPkColumn == null && navObjectNameColumnInfo.Navigat.Name2 == null, listItemEntity.EntityName + " not primary key", listItemEntity.EntityName + "没有主键"); + if (navObjectNameColumnInfo.Navigat.Name2.HasValue()) + { + listItemPkColumn = listItemEntity.Columns.Where(it => it.PropertyName == navObjectNameColumnInfo.Navigat.Name2).FirstOrDefault(); + Check.ExceptionEasy(listItemPkColumn == null, $"{navObjectNameColumnInfo.PropertyName} Navigate is error ", $"{navObjectNameColumnInfo.PropertyName}导航配置错误,可能顺序反了。"); + } + var ids = list.Select(it => it.GetType().GetProperty(navColumn.PropertyName).GetValue(it)).SelectMany(it => (it as IEnumerable).Cast()).Distinct().ToList(); + List conditionalModels = new List(); + if (IsEnumNumber(navColumn)) + { + ids = ids.Select(it => Convert.ToInt64(it)).Cast().ToList(); + } + if (navColumn?.UnderType?.Name == UtilConstants.StringType.Name) + { + ids = ids.Select(it => it?.ToString()?.Replace(",", "[comma]")).Cast().ToList(); + } + conditionalModels.Add((new ConditionalModel() + { + ConditionalType = ConditionalType.In, + FieldName = listItemPkColumn.DbColumnName, + FieldValue = String.Join(",", ids), + CSharpTypeName = listItemPkColumn?.UnderType?.Name + })); + var sqlObj = GetWhereSql(childDb, navObjectNameColumnInfo.Navigat.Name); + + if (list.Any() && navObjectNamePropety.GetValue(list.First()) == null) + { + if (sqlObj.SelectString == null) + { + var columns = navEntityInfo.Columns.Where(it => !it.IsIgnore) + .Select(it => GetOneToManySelectByColumnInfo(it, childDb)).ToList(); + sqlObj.SelectString = String.Join(",", columns); + } + var navList = selector(childDb.Queryable(sqlObj.TableShortName).AS(GetDbTableName(navEntityInfo, sqlObj)).ClearFilter(QueryBuilder.RemoveFilters).Filter(this.QueryBuilder?.IsDisabledGobalFilter == true ? null : navEntityInfo.Type).AddParameters(sqlObj.Parameters).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(), sqlObj.WhereString).WhereIF(navObjectNameColumnInfo?.Navigat?.WhereSql != null, navObjectNameColumnInfo?.Navigat?.WhereSql).Select(sqlObj.SelectString).OrderByIF(sqlObj.OrderByString.HasValue(), sqlObj.OrderByString)); + if (navList.HasValue()) + { + //var setValue = navList + // .Where(x => navColumn.PropertyInfo.GetValue(x).ObjToString() == listItemPkColumn.PropertyInfo.GetValue(item).ObjToString()).ToList(); + var groupQuery = (from l in list.Distinct() + join n in navList + on listItemPkColumn.PropertyInfo.GetValue(l).ObjToString() + equals navColumn.PropertyInfo.GetValue(n).ObjToString() + select new + { + l, + n + }).GroupBy(it => it.l).ToList(); + foreach (var item in groupQuery) + { + var itemSelectList = item.Select(it => it.n); + if (sqlObj.Skip != null) + { + itemSelectList = itemSelectList + .Skip(sqlObj.Skip.Value); + } + if (sqlObj.Take != null) + { + itemSelectList = itemSelectList + .Take(sqlObj.Take.Value); + } + if (sqlObj.MappingExpressions.HasValue()) + { + MappingFieldsHelper helper = new MappingFieldsHelper(); + helper.NavEntity = navEntityInfo; + helper.Context = this.Context; + helper.RootEntity = this.Context.EntityMaintenance.GetEntityInfo(); + helper.SetChildList(navObjectNameColumnInfo, item.Key, itemSelectList.ToList(), sqlObj.MappingExpressions); + } + else + { + + var instance = Activator.CreateInstance(navObjectNamePropety.PropertyType, true); + var ilist = instance as IList; + foreach (var value in itemSelectList.ToList()) + { + ilist.Add(value); + } + navObjectNamePropety.SetValue(item.Key, instance); + } + } + foreach (var item in list) + { + if (navObjectNamePropety.GetValue(item) == null) + { + var instance = Activator.CreateInstance(navObjectNamePropety.PropertyType, true); + navObjectNamePropety.SetValue(item, instance); + } + } + } + else + { + //No navigation data set new List() + foreach (var item in list) + { + var instance = Activator.CreateInstance(navObjectNamePropety.PropertyType, true); + navObjectNamePropety.SetValue(item, instance); + } + } + } + } private void OneToMany(List list, Func, List> selector, EntityInfo listItemEntity, System.Reflection.PropertyInfo navObjectNamePropety, EntityColumnInfo navObjectNameColumnInfo) { diff --git a/Src/Asp.NetCore2/SqlSugar/Enum/NavigatType.cs b/Src/Asp.NetCore2/SqlSugar/Enum/NavigatType.cs index 938d68fae..9b6c25478 100644 --- a/Src/Asp.NetCore2/SqlSugar/Enum/NavigatType.cs +++ b/Src/Asp.NetCore2/SqlSugar/Enum/NavigatType.cs @@ -12,6 +12,7 @@ namespace SqlSugar OneToMany=2, ManyToOne=3, ManyToMany=4, - Dynamic=5 + Dynamic=5, + OneToManyByArrayList } }