lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-04-24 18:04:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!45 优化ToPivotTable和ToPivotList

Browse Source 
Merge pull request !45 from yanghs/master
This commit is contained in:
sunkaixuan 2024-01-05 17:44:57 +00:00 committed by Gitee
commit 6240ef3f79
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 104 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSql.cs
View File

@ -228,7 +228,7 @@ namespace SqlSugar
{
return this.ToList().ToPivotTable(columnSelector, rowSelector, dataSelector);
}
public virtual List<dynamic> ToPivotList<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector)
public virtual IEnumerable<dynamic> ToPivotList<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector)
{
return this.ToList().ToPivotList(columnSelector, rowSelector, dataSelector);
}

2
Src/Asp.Net/SqlSugar/Interface/IQueryable.cs
View File

@ -286,7 +286,7 @@ namespace SqlSugar
ISugarQueryable<T> IgnoreColumns(Expression<Func<T, object>> columns);
ISugarQueryable<T> IgnoreColumns(params string[] columns);
DataTable ToPivotTable<TColumn, TRow, TData>(Func<T, TColumn> columnSelector,Expression<Func<T, TRow>> rowSelector,Func<IEnumerable<T>, TData> dataSelector);
List<dynamic> ToPivotList<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector);
IEnumerable<dynamic> ToPivotList<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector);
string ToPivotJson<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector);
ISugarQueryable<T> SplitTable(Func<List<SplitTableInfo>,IEnumerable<SplitTableInfo>> getTableNamesFunc);
ISugarQueryable<T> SplitTable(DateTime beginTime,DateTime endTime);

124
Src/Asp.Net/SqlSugar/Utilities/DataTableExtensions.cs
View File

@ -19,59 +19,51 @@ namespace SqlSugar
Func<IEnumerable<T>, TData> dataSelector)
{
DataTable table = new DataTable();
var rowName = new List<string>();
if (rowSelector.Body is MemberExpression)
rowName.Add(((MemberExpression)rowSelector.Body).Member.Name);
else
rowName.AddRange(((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name));
table.Columns.AddRange(rowName.Select(x => new DataColumn(x)).ToArray());
var columns = source.Select(columnSelector).Distinct();
foreach (var column in columns)
table.Columns.Add(new DataColumn(column?.ToString()));
table.Columns.AddRange(columns.Select(x => new DataColumn(x?.ToString())).ToArray());
var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup => new
{
Key = rowGroup.Key,
Values = columns.GroupJoin(
rowGroup,
c => c,
r => columnSelector(r),
(c, columnGroup) => dataSelector(columnGroup))
});
foreach (var row in rows)
{
var dataRow = table.NewRow();
var items = row.Values.Cast<object>().ToList();
// 获取匿名对象的动态类型
var anonymousType = row.Key.GetType();
// 获取匿名对象的所有属性
var properties = anonymousType.GetProperties();
for (var i = 0; i < rowName.Count; i++)
{
items.Insert(i, properties[i].GetValue(row.Key, null));
}
dataRow.ItemArray = items.ToArray();
table.Rows.Add(dataRow);
}
.Select(rowGroup =>
{
var anonymousType = rowGroup.Key.GetType();
var properties = anonymousType.GetProperties();
var row = table.NewRow();
columns.GroupJoin(rowGroup, c => c, r => columnSelector(r),
(c, columnGroup) =>
{
var dic = new Dictionary<string, object>();
if (c != null)
dic[c.ToString()] = dataSelector(columnGroup);
return dic;
})
.SelectMany(x => x)
.Select(x => row[x.Key] = x.Value)
.SelectMany(x => properties, (x, y) => row[y.Name] = y.GetValue(rowGroup.Key, null))
.ToArray();
table.Rows.Add(row);
return row;
}
).ToList();
return table;
}
public static List<dynamic> ToPivotList<T, TColumn, TRow, TData>(
this IEnumerable<T> source,
Func<T, TColumn> columnSelector,
Expression<Func<T, TRow>> rowSelector,
Func<IEnumerable<T>, TData> dataSelector)
public static IEnumerable<dynamic> ToPivotList<T, TColumn, TRow, TData>(
this IEnumerable<T> source,
Func<T, TColumn> columnSelector,
Expression<Func<T, TRow>> rowSelector,
Func<IEnumerable<T>, TData> dataSelector)
{
var arr = new List<dynamic>();
var cols = new List<string>();
var rowName = new List<string>();
if (rowSelector.Body is MemberExpression)
rowName.Add(((MemberExpression)rowSelector.Body).Member.Name);
@ -80,47 +72,27 @@ namespace SqlSugar
var columns = source.Select(columnSelector).Distinct();
cols = rowName.Concat(columns.Select(x => x?.ToString())).ToList();
var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup => new
{
Key = rowGroup.Key,
Values = columns.GroupJoin(
rowGroup,
c => c,
r => columnSelector(r),
(c, columnGroup) => dataSelector(columnGroup))
});
foreach (var row in rows)
{
var items = row.Values.Cast<object>().ToList();
// 获取匿名对象的动态类型
var anonymousType = row.Key.GetType();
// 获取匿名对象的所有属性
var properties = anonymousType.GetProperties();
for (var i = 0; i < rowName.Count; i++)
.Select(rowGroup =>
{
items.Insert(i, properties[i].GetValue(row.Key, null));
}
var obj = GetAnonymousObject(cols, items);
arr.Add(obj);
}
return arr;
}
private static dynamic GetAnonymousObject(IEnumerable<string> columns, IEnumerable<object> values)
{
IDictionary<string, object> eo = new ExpandoObject() as IDictionary<string, object>;
int i;
for (i = 0; i < columns.Count(); i++)
{
eo.Add(columns.ElementAt<string>(i), values.ElementAt<object>(i));
}
return eo;
var anonymousType = rowGroup.Key.GetType();
var properties = anonymousType.GetProperties();
IDictionary<string, object> row = new ExpandoObject();
columns.GroupJoin(rowGroup, c => c, r => columnSelector(r),
(c, columnGroup) =>
{
IDictionary<string, object> dic = new ExpandoObject();
if (c != null)
dic[c.ToString()] = dataSelector(columnGroup);
return dic;
})
.SelectMany(x => x)
.Select(x => row[x.Key] = x.Value)
.SelectMany(x => properties, (x, y) => row[y.Name] = y.GetValue(rowGroup.Key, null))
.ToList();
return row;
});
return rows;
}
}
}

2
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSql.cs
View File

@ -228,7 +228,7 @@ namespace SqlSugar
{
return this.ToList().ToPivotTable(columnSelector, rowSelector, dataSelector);
}
public virtual List<dynamic> ToPivotList<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector)
public virtual IEnumerable<dynamic> ToPivotList<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector)
{
return this.ToList().ToPivotList(columnSelector, rowSelector, dataSelector);
}

2
Src/Asp.NetCore2/SqlSugar/Interface/IQueryable.cs
View File

@ -286,7 +286,7 @@ namespace SqlSugar
ISugarQueryable<T> IgnoreColumns(Expression<Func<T, object>> columns);
ISugarQueryable<T> IgnoreColumns(params string[] columns);
DataTable ToPivotTable<TColumn, TRow, TData>(Func<T, TColumn> columnSelector,Expression<Func<T, TRow>> rowSelector,Func<IEnumerable<T>, TData> dataSelector);
List<dynamic> ToPivotList<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector);
IEnumerable<dynamic> ToPivotList<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector);
string ToPivotJson<TColumn, TRow, TData>(Func<T, TColumn> columnSelector, Expression<Func<T, TRow>> rowSelector, Func<IEnumerable<T>, TData> dataSelector);
ISugarQueryable<T> SplitTable(Func<List<SplitTableInfo>,IEnumerable<SplitTableInfo>> getTableNamesFunc);
ISugarQueryable<T> SplitTable(DateTime beginTime,DateTime endTime);

134
Src/Asp.NetCore2/SqlSugar/Utilities/DataTableExtensions.cs
View File

@ -2,10 +2,8 @@
using System.Collections.Generic;
using System.Data;
using System.Dynamic;
using System.IO;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -15,65 +13,57 @@ namespace SqlSugar
internal static class DataTableExtensions
{
public static DataTable ToPivotTable<T, TColumn, TRow, TData>(
this IEnumerable<T> source,
Func<T, TColumn> columnSelector,
Expression<Func<T, TRow>> rowSelector,
Func<IEnumerable<T>, TData> dataSelector)
this IEnumerable<T> source,
Func<T, TColumn> columnSelector,
Expression<Func<T, TRow>> rowSelector,
Func<IEnumerable<T>, TData> dataSelector)
{
DataTable table = new DataTable();
var rowName = new List<string>();
if (rowSelector.Body is MemberExpression)
rowName.Add(((MemberExpression)rowSelector.Body).Member.Name);
else
rowName.AddRange(((NewExpression)rowSelector.Body).Arguments.Select(it => it as MemberExpression).Select(it => it.Member.Name));
table.Columns.AddRange(rowName.Select(x => new DataColumn(x)).ToArray());
var columns = source.Select(columnSelector).Distinct();
foreach (var column in columns)
table.Columns.Add(new DataColumn(column?.ToString()));
table.Columns.AddRange(columns.Select(x => new DataColumn(x?.ToString())).ToArray());
var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup => new
{
Key = rowGroup.Key,
Values = columns.GroupJoin(
rowGroup,
c => c,
r => columnSelector(r),
(c, columnGroup) => dataSelector(columnGroup))
});
foreach (var row in rows)
{
var dataRow = table.NewRow();
var items = row.Values.Cast<object>().ToList();
// 获取匿名对象的动态类型
var anonymousType = row.Key.GetType();
// 获取匿名对象的所有属性
var properties = anonymousType.GetProperties();
for (var i = 0; i < rowName.Count; i++)
{
items.Insert(i, properties[i].GetValue(row.Key, null));
}
dataRow.ItemArray = items.ToArray();
table.Rows.Add(dataRow);
}
.Select(rowGroup =>
{
var anonymousType = rowGroup.Key.GetType();
var properties = anonymousType.GetProperties();
var row = table.NewRow();
columns.GroupJoin(rowGroup, c => c, r => columnSelector(r),
(c, columnGroup) =>
{
var dic = new Dictionary<string, object>();
if (c != null)
dic[c.ToString()] = dataSelector(columnGroup);
return dic;
})
.SelectMany(x => x)
.Select(x => row[x.Key] = x.Value)
.SelectMany(x => properties, (x, y) => row[y.Name] = y.GetValue(rowGroup.Key, null))
.ToArray();
table.Rows.Add(row);
return row;
}
).ToList();
return table;
}
public static List<dynamic> ToPivotList<T, TColumn, TRow, TData>(
this IEnumerable<T> source,
Func<T, TColumn> columnSelector,
Expression<Func<T, TRow>> rowSelector,
Func<IEnumerable<T>, TData> dataSelector)
public static IEnumerable<dynamic> ToPivotList<T, TColumn, TRow, TData>(
this IEnumerable<T> source,
Func<T, TColumn> columnSelector,
Expression<Func<T, TRow>> rowSelector,
Func<IEnumerable<T>, TData> dataSelector)
{
var arr = new List<dynamic>();
var cols = new List<string>();
var rowName = new List<string>();
if (rowSelector.Body is MemberExpression)
rowName.Add(((MemberExpression)rowSelector.Body).Member.Name);
@ -82,47 +72,27 @@ namespace SqlSugar
var columns = source.Select(columnSelector).Distinct();
cols = rowName.Concat(columns.Select(x => x?.ToString())).ToList();
var rows = source.GroupBy(rowSelector.Compile())
.Select(rowGroup => new
{
Key = rowGroup.Key,
Values = columns.GroupJoin(
rowGroup,
c => c,
r => columnSelector(r),
(c, columnGroup) => dataSelector(columnGroup))
});
foreach (var row in rows)
{
var items = row.Values.Cast<object>().ToList();
// 获取匿名对象的动态类型
var anonymousType = row.Key.GetType();
// 获取匿名对象的所有属性
var properties = anonymousType.GetProperties();
for (var i = 0; i < rowName.Count; i++)
.Select(rowGroup =>
{
items.Insert(i, properties[i].GetValue(row.Key, null));
}
var obj = GetAnonymousObject(cols, items);
arr.Add(obj);
}
return arr;
}
private static dynamic GetAnonymousObject(IEnumerable<string> columns, IEnumerable<object> values)
{
IDictionary<string, object> eo = new ExpandoObject() as IDictionary<string, object>;
int i;
for (i = 0; i < columns.Count(); i++)
{
eo.Add(columns.ElementAt<string>(i), values.ElementAt<object>(i));
}
return eo;
var anonymousType = rowGroup.Key.GetType();
var properties = anonymousType.GetProperties();
IDictionary<string, object> row = new ExpandoObject();
columns.GroupJoin(rowGroup, c => c, r => columnSelector(r),
(c, columnGroup) =>
{
IDictionary<string, object> dic = new ExpandoObject();
if (c != null)
dic[c.ToString()] = dataSelector(columnGroup);
return dic;
})
.SelectMany(x => x)
.Select(x => row[x.Key] = x.Value)
.SelectMany(x => properties, (x, y) => row[y.Name] = y.GetValue(rowGroup.Key, null))
.ToList();
return row;
});
return rows;
}
}
}