From 35ff148b68da779d69d5b4a8770bba14264e8513 Mon Sep 17 00:00:00 2001 From: wintel Date: Wed, 12 Jun 2024 21:22:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Infrastructure/DynamicLinq.cs | 34 ++++---- Infrastructure/Filter.cs | 87 ++++++++++++++----- Infrastructure/QueryObjExtension.cs | 4 +- Infrastructure/Test/TestDynamicLinq.cs | 10 +-- OpenAuth.App/Base/BaseApp.cs | 2 +- OpenAuth.App/Base/SqlSugarBaseApp.cs | 2 +- OpenAuth.App/Test/TestDataPrivilege.cs | 8 +- OpenAuth.Repository/Test/TestDynamicLinq.cs | 10 +-- .../Test/TestSugarDynamicLinq.cs | 10 +-- 9 files changed, 103 insertions(+), 64 deletions(-) diff --git a/Infrastructure/DynamicLinq.cs b/Infrastructure/DynamicLinq.cs index 5dbd361e..f1c3d9d7 100644 --- a/Infrastructure/DynamicLinq.cs +++ b/Infrastructure/DynamicLinq.cs @@ -175,7 +175,7 @@ namespace Infrastructure { if (!string.IsNullOrEmpty(filterjson)) { - var filterGroup = JsonHelper.Instance.Deserialize(filterjson); + var filterGroup = JsonHelper.Instance.Deserialize(filterjson); query = GenerateFilter(query, parametername, filterGroup); } @@ -186,7 +186,7 @@ namespace Infrastructure { if (!string.IsNullOrEmpty(filterjson)) { - var filterGroup = JsonHelper.Instance.Deserialize(filterjson); + var filterGroup = JsonHelper.Instance.Deserialize(filterjson); query = GenerateFilter(query, parametername, filterGroup); } @@ -199,13 +199,13 @@ namespace Infrastructure /// /// /// - /// + /// /// public static IQueryable GenerateFilter(this IQueryable query, string parametername, - FilterGroup filterGroup) + QueryObject queryObject) { var param = CreateLambdaParam(parametername); - Expression result = ConvertGroup(filterGroup, param); + Expression result = ConvertGroup(queryObject, param); query = query.Where(param.GenerateTypeLambda(result)); return query; } @@ -215,14 +215,14 @@ namespace Infrastructure /// /// /// - /// + /// /// /// public static ISugarQueryable GenerateFilter(this ISugarQueryable query, string parametername, - FilterGroup filterGroup) + QueryObject queryObject) { var param = CreateLambdaParam(parametername); - Expression result = ConvertGroup(filterGroup, param); + Expression result = ConvertGroup(queryObject, param); query = query.Where(param.GenerateTypeLambda(result)); return query; } @@ -230,25 +230,25 @@ namespace Infrastructure /// /// 转换filtergroup为表达式 /// - /// + /// /// /// /// - public static Expression ConvertGroup(FilterGroup filterGroup, ParameterExpression param) + public static Expression ConvertGroup(QueryObject queryObject, ParameterExpression param) { - if (filterGroup == null) return null; + if (queryObject == null) return null; - if (filterGroup.Filters.Length == 1 &&(filterGroup.Children == null || !filterGroup.Children.Any())) //只有一个条件 + if (queryObject.Filters.Length == 1 &&(queryObject.Children == null || !queryObject.Children.Any())) //只有一个条件 { - return param.GenerateBody(filterGroup.Filters[0]); + return param.GenerateBody(queryObject.Filters[0]); } - Expression result = ConvertFilters(filterGroup.Filters, param, filterGroup.Operation); - Expression gresult = ConvertGroup(filterGroup.Children, param, filterGroup.Operation); + Expression result = ConvertFilters(queryObject.Filters, param, queryObject.Operation); + Expression gresult = ConvertGroup(queryObject.Children, param, queryObject.Operation); if (gresult == null) return result; if (result == null) return gresult; - if (filterGroup.Operation == "and") + if (queryObject.Operation == "and") { return result.AndAlso(gresult); } @@ -266,7 +266,7 @@ namespace Infrastructure /// /// /// - private static Expression ConvertGroup(FilterGroup[] groups, ParameterExpression param, string operation) + private static Expression ConvertGroup(QueryObject[] groups, ParameterExpression param, string operation) { if (groups == null || !groups.Any()) return null; diff --git a/Infrastructure/Filter.cs b/Infrastructure/Filter.cs index 584b4020..8f50f90a 100644 --- a/Infrastructure/Filter.cs +++ b/Infrastructure/Filter.cs @@ -1,25 +1,64 @@ -namespace Infrastructure -{ - - public class Filter - { - public string Key { get; set; } - public string Value { get; set; } - public string Contrast { get; set; } - - public string Text { get; set; } - } - - public class FilterGroup - { - /// - /// or /and - /// - public string Operation { get; set; } - public Filter[] Filters { get; set; } - public FilterGroup[] Children { get; set; } - } - - - +namespace Infrastructure +{ + + /// + /// 查询表达式中的最小单元，如： + /// new Filter {Key = "name", Value = "yubaolee", Contrast = "=="}, + /// new Filter {Key = "name", Value = "yubaolee", Contrast = "contains"}, + /// new Filter {Key = "age", Value = "10,20,30", Contrast = "in"}, + /// new Filter {Key = "10,20,30", Value = "40", Contrast = "intersect"} + /// + public class Filter + { + /// + /// 过滤条件的关键字。 + /// + public string Key { get; set; } + + /// + /// 通常为值，如：yubaolee、10、10,20,30等。 + /// + public string Value { get; set; } + + /// + /// 通常为运算符，如：==、contains、in、intersect等。 + /// + public string Contrast { get; set; } + + /// + /// 对于特殊值的说明 + /// + public string Text { get; set; } + } + + /// + /// 查询对象类，用于封装查询条件。 + /// + public class QueryObject + { + /// + /// 操作类型，定义了查询条件之间的逻辑关系，如OR、AND。 + /// + /// + /// 该属性决定了如何组合多个过滤条件，以构建复杂的查询逻辑。 + /// + public string Operation { get; set; } + + /// + /// 过滤器数组，包含一组过滤条件。 + /// + public Filter[] Filters { get; set; } + + /// + /// 子查询对象数组，支持嵌套查询。 + /// + /// + /// 通过嵌套查询对象，可以构建复杂的查询逻辑，处理更复杂的数据关系。 + /// + public QueryObject[] Children { get; set; } + } + + + + } \ No newline at end of file diff --git a/Infrastructure/QueryObjExtension.cs b/Infrastructure/QueryObjExtension.cs index 2e5ea3cd..65ebb714 100644 --- a/Infrastructure/QueryObjExtension.cs +++ b/Infrastructure/QueryObjExtension.cs @@ -11,7 +11,7 @@ public static class QueryObjExtension /// /// 根据过滤器组构建查询。 /// - public static string BuildQuery(this FilterGroup query) + public static string BuildQuery(this QueryObject query) { StringBuilder sb = new StringBuilder(); BuildQuery(query, sb); @@ -21,7 +21,7 @@ public static class QueryObjExtension /// /// 递归构建查询字符串。 /// - private static void BuildQuery(FilterGroup query, StringBuilder sb) + private static void BuildQuery(QueryObject query, StringBuilder sb) { // 构建当前过滤器组的过滤条件 if (query.Filters != null && query.Filters.Length > 0) diff --git a/Infrastructure/Test/TestDynamicLinq.cs b/Infrastructure/Test/TestDynamicLinq.cs index ddaef10d..27d9c6ca 100644 --- a/Infrastructure/Test/TestDynamicLinq.cs +++ b/Infrastructure/Test/TestDynamicLinq.cs @@ -9,7 +9,7 @@ namespace Infrastructure.Test [Test] public void Convert() { - FilterGroup sub = new FilterGroup + QueryObject sub = new QueryObject { Operation = "or" }; @@ -19,22 +19,22 @@ namespace Infrastructure.Test new Filter {Key = "c3", Value = "10,20,30", Contrast = "in"} }; - FilterGroup filterGroup = new FilterGroup + QueryObject queryObject = new QueryObject { Operation = "and" }; - filterGroup.Filters = new[] + queryObject.Filters = new[] { new Filter {Key = "c1", Value = "name", Contrast = "contains"}, new Filter {Key = "10,20,30", Value = "40", Contrast = "intersect"} }; - filterGroup.Children = new[] + queryObject.Children = new[] { sub }; - var expression = DynamicLinq.ConvertGroup(filterGroup, + var expression = DynamicLinq.ConvertGroup(queryObject, Expression.Parameter(typeof(TestOjb), "c")); Console.WriteLine(expression.ToString()); diff --git a/OpenAuth.App/Base/BaseApp.cs b/OpenAuth.App/Base/BaseApp.cs index b7ec26d3..66824213 100644 --- a/OpenAuth.App/Base/BaseApp.cs +++ b/OpenAuth.App/Base/BaseApp.cs @@ -63,7 +63,7 @@ namespace OpenAuth.App string.Join(',',orgs)); } return UnitWork.Find(null).GenerateFilter(parametername, - JsonHelper.Instance.Deserialize(rule.PrivilegeRules)); + JsonHelper.Instance.Deserialize(rule.PrivilegeRules)); } /// diff --git a/OpenAuth.App/Base/SqlSugarBaseApp.cs b/OpenAuth.App/Base/SqlSugarBaseApp.cs index 89edef2a..f576c160 100644 --- a/OpenAuth.App/Base/SqlSugarBaseApp.cs +++ b/OpenAuth.App/Base/SqlSugarBaseApp.cs @@ -75,7 +75,7 @@ namespace OpenAuth.App string.Join(',',orgs)); } return SugarClient.Queryable().GenerateFilter(parametername, - JsonHelper.Instance.Deserialize(rule.PrivilegeRules)); + JsonHelper.Instance.Deserialize(rule.PrivilegeRules)); } /// diff --git a/OpenAuth.App/Test/TestDataPrivilege.cs b/OpenAuth.App/Test/TestDataPrivilege.cs index 3b968457..2891a5b6 100644 --- a/OpenAuth.App/Test/TestDataPrivilege.cs +++ b/OpenAuth.App/Test/TestDataPrivilege.cs @@ -18,7 +18,7 @@ namespace OpenAuth.App.Test var services = new ServiceCollection(); var cachemock = new Mock(); - cachemock.Setup(x => x.Get("tokentest")).Returns(new UserAuthSession { Account = "Systems" }); + cachemock.Setup(x => x.Get("tokentest")).Returns(new UserAuthSession { Account = "admin" }); services.AddScoped(x => cachemock.Object); var httpContextAccessorMock = new Mock(); @@ -37,7 +37,7 @@ namespace OpenAuth.App.Test { var app = _autofacServiceProvider.GetService(); var result = app.Load(new QueryResourcesReq()); - Console.WriteLine(JsonHelper.Instance.Serialize(result)); + Console.WriteLine(JsonHelper.Instance.Serialize(result.Result)); } [Test] @@ -46,7 +46,7 @@ namespace OpenAuth.App.Test var auth = _autofacServiceProvider.GetService(); var app = _autofacServiceProvider.GetService(); //该测试解析为：针对资源列表，【管理员】可以看到所有，角色为【神】或【测试】的只能看到自己创建的 - var filterGroup = new FilterGroup + var filterGroup = new QueryObject { Operation = "or" }; @@ -61,7 +61,7 @@ namespace OpenAuth.App.Test }; filterGroup.Children = new[] { - new FilterGroup //登录用户角色包含【测试】或包含【神】的，只能看到自己的 + new QueryObject //登录用户角色包含【测试】或包含【神】的，只能看到自己的 { Operation = "and", Filters = new Filter[] diff --git a/OpenAuth.Repository/Test/TestDynamicLinq.cs b/OpenAuth.Repository/Test/TestDynamicLinq.cs index 3e718f8a..6a98bba3 100644 --- a/OpenAuth.Repository/Test/TestDynamicLinq.cs +++ b/OpenAuth.Repository/Test/TestDynamicLinq.cs @@ -59,7 +59,7 @@ namespace OpenAuth.Repository.Test [Test] public void TestDynamic() { - FilterGroup sub = new FilterGroup + QueryObject sub = new QueryObject { Operation = "or" }; @@ -69,24 +69,24 @@ namespace OpenAuth.Repository.Test new Filter {Key = "Sex", Value = "10", Contrast = "=="} }; - FilterGroup filterGroup = new FilterGroup + QueryObject queryObject = new QueryObject { Operation = "and" }; - filterGroup.Filters = new[] + queryObject.Filters = new[] { new Filter {Key = "Account", Value = "name", Contrast = "=="}, new Filter {Key = "Password", Value = "10", Contrast = "=="} }; - filterGroup.Children = new[] + queryObject.Children = new[] { sub }; var dbcontext = _autofacServiceProvider.GetService(); - var query = dbcontext.Users.GenerateFilter("c",JsonHelper.Instance.Serialize(filterGroup)); + var query = dbcontext.Users.GenerateFilter("c",JsonHelper.Instance.Serialize(queryObject)); Console.WriteLine(query.Expression.ToString()); } } diff --git a/OpenAuth.Repository/Test/TestSugarDynamicLinq.cs b/OpenAuth.Repository/Test/TestSugarDynamicLinq.cs index 51c1664c..ff3c4451 100644 --- a/OpenAuth.Repository/Test/TestSugarDynamicLinq.cs +++ b/OpenAuth.Repository/Test/TestSugarDynamicLinq.cs @@ -73,7 +73,7 @@ namespace OpenAuth.Repository.Test [Test] public void TestDynamic() { - FilterGroup sub = new FilterGroup + QueryObject sub = new QueryObject { Operation = "or" }; @@ -83,24 +83,24 @@ namespace OpenAuth.Repository.Test new Filter {Key = "Sex", Value = "10", Contrast = "=="} }; - FilterGroup filterGroup = new FilterGroup + QueryObject queryObject = new QueryObject { Operation = "and" }; - filterGroup.Filters = new[] + queryObject.Filters = new[] { new Filter {Key = "Account", Value = "name", Contrast = "=="}, new Filter {Key = "Password", Value = "10", Contrast = "=="} }; - filterGroup.Children = new[] + queryObject.Children = new[] { sub }; var sugarClient = _autofacServiceProvider.GetService(); - var query = sugarClient.Queryable().GenerateFilter("c",filterGroup); + var query = sugarClient.Queryable().GenerateFilter("c",queryObject); Console.WriteLine(query.ToSqlString()); } }