diff --git a/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj b/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj index 982e808..66d75af 100644 --- a/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj +++ b/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj @@ -2,6 +2,8 @@ netstandard2.0 + 0.0.1 + 通用查询组件 diff --git a/APIJSON.NET/APIJSONCommon/ApiJson.Common_461.csproj b/APIJSON.NET/APIJSONCommon/ApiJson.Common_461.csproj new file mode 100644 index 0000000..ef2a11b --- /dev/null +++ b/APIJSON.NET/APIJSONCommon/ApiJson.Common_461.csproj @@ -0,0 +1,97 @@ + + + + + Debug + AnyCPU + {DC07586E-7241-4BB5-9200-CE57A81C5E27} + Library + Properties + APIJSON.NET + ApiJson.Common + v4.6.1 + 512 + true + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + + packages\AspectCore.Extensions.Reflection.1.2.0\lib\net45\AspectCore.Extensions.Reflection.dll + + + + packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + packages\Microsoft.Extensions.Options.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll + + + packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll + + + packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + + + packages\sqlSugar.4.9.9.10\lib\SqlSugar.dll + + + + packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + + packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll + + + + + packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll + + + + packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll + + + packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/APIJSON.NET/APIJSONCommon/ApiJson.Common_461.sln b/APIJSON.NET/APIJSONCommon/ApiJson.Common_461.sln new file mode 100644 index 0000000..9689606 --- /dev/null +++ b/APIJSON.NET/APIJSONCommon/ApiJson.Common_461.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.202 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiJson.Common_461", "ApiJson.Common_461.csproj", "{DC07586E-7241-4BB5-9200-CE57A81C5E27}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "APIJSON.NET.Test", "..\APIJSON.NET.Test\APIJSON.NET.Test.csproj", "{3F99B6A8-3A58-4714-A0FF-186BE2874A68}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DC07586E-7241-4BB5-9200-CE57A81C5E27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC07586E-7241-4BB5-9200-CE57A81C5E27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC07586E-7241-4BB5-9200-CE57A81C5E27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC07586E-7241-4BB5-9200-CE57A81C5E27}.Release|Any CPU.Build.0 = Release|Any CPU + {3F99B6A8-3A58-4714-A0FF-186BE2874A68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F99B6A8-3A58-4714-A0FF-186BE2874A68}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F99B6A8-3A58-4714-A0FF-186BE2874A68}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F99B6A8-3A58-4714-A0FF-186BE2874A68}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {53F36702-3FD9-4AF5-A4C3-E3C30C943492} + EndGlobalSection +EndGlobal diff --git a/APIJSON.NET/APIJSONCommon/FuncList.cs b/APIJSON.NET/APIJSONCommon/FuncList.cs index 59d5a45..a92f653 100644 --- a/APIJSON.NET/APIJSONCommon/FuncList.cs +++ b/APIJSON.NET/APIJSONCommon/FuncList.cs @@ -8,14 +8,34 @@ namespace APIJSON.NET /// public class FuncList { + /// + /// + /// + /// + /// + /// public string Merge(object a, object b) { return a.ToString() + b.ToString(); } + + /// + /// + /// + /// + /// + /// public object MergeObj(object a, object b) { return new { a, b }; } + + /// + /// + /// + /// + /// + /// public bool isContain(object a, object b) { return a.ToString().Split(',').Contains(b); diff --git a/APIJSON.NET/APIJSONCommon/Infrastructure/StringExtensions.cs b/APIJSON.NET/APIJSONCommon/Infrastructure/StringExtensions.cs index ee7d149..e806081 100644 --- a/APIJSON.NET/APIJSONCommon/Infrastructure/StringExtensions.cs +++ b/APIJSON.NET/APIJSONCommon/Infrastructure/StringExtensions.cs @@ -14,6 +14,12 @@ public static bool IsValue(this object str) { return str != null && !string.IsNullOrEmpty(str.ToString()); } + + /// + /// + /// + /// + /// public static string GetParamName(this string param) { return param + new Random().Next(1, 100); diff --git a/APIJSON.NET/APIJSONCommon/Models/DbOptions.cs b/APIJSON.NET/APIJSONCommon/Models/DbOptions.cs index 0fe7840..8d4c3a3 100644 --- a/APIJSON.NET/APIJSONCommon/Models/DbOptions.cs +++ b/APIJSON.NET/APIJSONCommon/Models/DbOptions.cs @@ -3,7 +3,14 @@ using SqlSugar; public class DbOptions { + /// + /// + /// public DbType DbType { get; set; } + + /// + /// + /// public string ConnectionString { get; set; } } } diff --git a/APIJSON.NET/APIJSONCommon/Properties/AssemblyInfo.cs b/APIJSON.NET/APIJSONCommon/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..b890e44 --- /dev/null +++ b/APIJSON.NET/APIJSONCommon/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("ApiJson.Common")] +[assembly: AssemblyDescription("单表查询的返回节点指定为Infos")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ApiJson.Common")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("dc07586e-7241-4bb5-9200-ce57a81c5e27")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("0.0.4.0")] +[assembly: AssemblyFileVersion("0.0.4.0")] diff --git a/APIJSON.NET/APIJSONCommon/SelectTable.cs b/APIJSON.NET/APIJSONCommon/SelectTable.cs index 502e687..4e76118 100644 --- a/APIJSON.NET/APIJSONCommon/SelectTable.cs +++ b/APIJSON.NET/APIJSONCommon/SelectTable.cs @@ -1,22 +1,30 @@ namespace APIJSON.NET { using APIJSON.NET.Services; - using Microsoft.Extensions.Options; + using AspectCore.Extensions.Reflection; using Newtonsoft.Json.Linq; using SqlSugar; using System; using System.Collections.Generic; using System.Dynamic; using System.Linq; - using AspectCore.Extensions.Reflection; using System.Text.RegularExpressions; + /// + /// + /// public class SelectTable { private readonly IIdentityService _identitySvc; private readonly ITableMapper _tableMapper; private readonly SqlSugarClient db; + /// + /// + /// + /// + /// + /// public SelectTable(IIdentityService identityService, ITableMapper tableMapper, SqlSugarClient dbClient) { _identitySvc = identityService; @@ -49,18 +57,27 @@ public bool IsCol(string table, string col) /// /// /// - public object ExecFunc(string funcname,object[] param, Type[] types) + public object ExecFunc(string funcname, object[] param, Type[] types) { var method = typeof(FuncList).GetMethod(funcname); - + var reflector = method.GetReflector(); var result = reflector.Invoke(new FuncList(), param); return result; } - public (dynamic,int) GetTableData(string subtable, int page, int count, string json, JObject dd) - { - + /// + /// + /// + /// + /// + /// + /// + /// + /// + public Tuple GetTableData(string subtable, int page, int count, int query, string json, JObject dd) + { + var role = _identitySvc.GetSelectRole(subtable); if (!role.Item1)//没有权限返回异常 { @@ -68,26 +85,48 @@ public object ExecFunc(string funcname,object[] param, Type[] types) } string selectrole = role.Item2; subtable = _tableMapper.GetTableName(subtable); - + JObject values = JObject.Parse(json); page = values["page"] == null ? page : int.Parse(values["page"].ToString()); count = values["count"] == null ? count : int.Parse(values["count"].ToString()); + query = values["query"] == null ? query : int.Parse(values["query"].ToString()); values.Remove("page"); values.Remove("count"); var tb = sugarQueryable(subtable, selectrole, values, dd); - if (count > 0) - { - int total = 0; - return (tb.ToPageList(page, count,ref total),total); - } + if (query == 1)//1-总数 + return new Tuple(new List(), tb.Count()); else { - return (tb.ToList(),tb.Count()); + if (count > 0) + { + int total = 0; + if (query == 0)//0-对象 + return new Tuple(tb.ToPageList(page, count), total); + else + //2-以上全部 + return new Tuple(tb.ToPageList(page, count, ref total), total); + + } + else + { + if (query == 0) + return new Tuple(tb.ToList(), 0); + else + return new Tuple(tb.ToList(), tb.Count()); + } } } - public dynamic GetFirstData(string subtable, string json, JObject dd) + + /// + /// + /// + /// + /// + /// + /// + public dynamic GetFirstData(string subtable, string json, JObject dd) { - + var role = _identitySvc.GetSelectRole(subtable); if (!role.Item1)//没有权限返回异常 { @@ -105,7 +144,7 @@ public dynamic GetFirstData(string subtable, string json, JObject dd) if (item.Value.IsValue()) { string func = item.Value.ToString().Substring(0, item.Value.ToString().IndexOf("(")); - string param = item.Value.ToString().Substring(item.Value.ToString().IndexOf("(") + 1).TrimEnd(')') ; + string param = item.Value.ToString().Substring(item.Value.ToString().IndexOf("(") + 1).TrimEnd(')'); var types = new List(); var paramss = new List(); foreach (var va in param.Split(',')) @@ -113,12 +152,12 @@ public dynamic GetFirstData(string subtable, string json, JObject dd) types.Add(typeof(object)); paramss.Add(tb.Where(it => it.Key.Equals(va)).Select(i => i.Value)); } - dic[item.Name] =ExecFunc(func, paramss.ToArray(), types.ToArray()); + dic[item.Name] = ExecFunc(func, paramss.ToArray(), types.ToArray()); } } - + return tb; - + } /// @@ -144,6 +183,45 @@ public JObject Query(string queryJson) return resultObj; } + /// + /// 单表查询 + /// + /// + /// + public JObject QuerySingle(JObject queryObj) + { + JObject resultObj = new JObject(); + resultObj.Add("code", "200"); + resultObj.Add("msg", "success"); + try + { + int total = 0; + foreach (var item in queryObj) + { + string key = item.Key.Trim(); + + if (key.EndsWith("[]")) + { + total = QuerySingleList(resultObj, item, "Infos"); + } + else if (key.Equals("func")) + { + ExecFunc(resultObj, item); + } + else if (key.Equals("total@")) + { + resultObj.Add("total", total); + } + } + } + catch (Exception ex) + { + resultObj["code"] = "500"; + resultObj["msg"] = ex.Message; + } + return resultObj; + } + /// /// 解析并查询 /// @@ -195,8 +273,8 @@ public JObject Query(JObject queryObj) return resultObj; } - //单表查询 - private int QuerySingleList(JObject resultObj, KeyValuePair item) + //单表查询,返回的数据在指定的NodeName节点 + private int QuerySingleList(JObject resultObj, KeyValuePair item, string nodeName) { string key = item.Key.Trim(); var jb = JObject.Parse(item.Value.ToString()); @@ -209,7 +287,7 @@ private int QuerySingleList(JObject resultObj, KeyValuePair item var htt = new JArray(); foreach (var t in jb) { - var datas = GetTableData(t.Key, page, count, t.Value.ToString(), null); + var datas = GetTableData(t.Key, page, count, query, t.Value.ToString(), null); if (query > 0) { total = datas.Item2; @@ -219,10 +297,23 @@ private int QuerySingleList(JObject resultObj, KeyValuePair item htt.Add(JToken.FromObject(data)); } } - resultObj.Add(key, htt); + + if (!string.IsNullOrEmpty(nodeName)) + { + resultObj.Add(nodeName, htt); + } + else + resultObj.Add(key, htt); return total; } + //单表查询 + private int QuerySingleList(JObject resultObj, KeyValuePair item) + { + string key = item.Key.Trim(); + return QuerySingleList(resultObj, item, key); + } + //多列表查询 private int QueryMoreList(JObject resultObj, KeyValuePair item) { @@ -242,7 +333,7 @@ private int QueryMoreList(JObject resultObj, KeyValuePair item) if (tables.Count > 0) { string table = tables[0]; - var temp = GetTableData(table, page, count, where[0], null); + var temp = GetTableData(table, page, count, query, where[0], null); if (query > 0) { total = temp.Item2; @@ -263,7 +354,7 @@ private int QueryMoreList(JObject resultObj, KeyValuePair item) count = jbb["count"] == null ? 0 : int.Parse(jbb["count"].ToString()); var lt = new JArray(); - foreach (var d in GetTableData(subtable, page, count, jbb[subtable].ToString(), zht).Item1) + foreach (var d in GetTableData(subtable, page, count, query, jbb[subtable].ToString(), zht).Item1) { lt.Add(JToken.FromObject(d)); } @@ -322,37 +413,13 @@ private ISugarQueryable sugarQueryable(string subtable, string se if (values["@column"].IsValue()) { - var str = new System.Text.StringBuilder(100); - foreach (var item in values["@column"].ToString().Split(',')) - { - string[] ziduan = item.Split(':'); - if (ziduan.Length > 1) - { - if (IsCol(subtable,ziduan[0]) &&_identitySvc.ColIsRole(ziduan[0], selectrole.Split(','))) - { - - str.Append(ziduan[0] + " as " + ziduan[1] + ","); - } - } - else - { - if (IsCol(subtable, item) && _identitySvc.ColIsRole(item, selectrole.Split(','))) - { - str.Append(item + ","); - } - } - } - if (string.IsNullOrEmpty(str.ToString())) - { - throw new Exception($"表名{subtable}没有可查询的字段！"); - } - tb.Select(str.ToString().TrimEnd(',')); + ProcessColumn(subtable, selectrole, values, tb); } else { tb.Select(selectrole); } - + List conModels = new List(); if (values["identity"].IsValue()) { @@ -361,56 +428,23 @@ private ISugarQueryable sugarQueryable(string subtable, string se foreach (var va in values) { string vakey = va.Key.Trim(); + string fieldValue = va.Value.ToString(); + if (vakey.EndsWith("$"))//模糊查询 { - if (IsCol(subtable,vakey.TrimEnd('$'))) - { - conModels.Add(new ConditionalModel() { FieldName = vakey.TrimEnd('$'), ConditionalType = ConditionalType.Like, FieldValue = va.Value.ToString() }); - } + FuzzyQuery(subtable, conModels, va); } else if (vakey.EndsWith("{}"))//逻辑运算 { - string field = vakey.TrimEnd("{}".ToCharArray()); - if (va.Value.HasValues) - { - conModels.Add(new ConditionalModel() { FieldName = field, ConditionalType = field.EndsWith("!") ? ConditionalType.NotIn : ConditionalType.In, FieldValue = va.Value.ToString() }); - } - else - { - var ddt = new List>(); - foreach (var and in va.Value.ToString().Split(',')) - { - var model = new ConditionalModel(); - model.FieldName = field; - if (and.StartsWith(">=")) - { - model.ConditionalType = ConditionalType.GreaterThanOrEqual; - model.FieldValue = and.TrimStart(">=".ToCharArray()); - } - else if (and.StartsWith("<=")) - { - - model.ConditionalType = ConditionalType.LessThanOrEqual; - model.FieldValue = and.TrimStart("<=".ToCharArray()); - } - else if (and.StartsWith(">")) - { - model.ConditionalType = ConditionalType.GreaterThan; - model.FieldValue = and.TrimStart('>'); - } - else if (and.StartsWith("<")) - { - model.ConditionalType = ConditionalType.LessThan; - model.FieldValue = and.TrimStart('<'); - } - ddt.Add(new KeyValuePair((field.EndsWith("&") ? WhereType.And : WhereType.Or), model)); - } - conModels.Add(new ConditionalCollections() { ConditionalList = ddt }); - } + ConditionQuery(subtable, conModels, va); + } + else if (vakey.EndsWith("%"))//bwtween查询 + { + ConditionBetween(subtable, conModels, va); } else if (vakey.EndsWith("@") && dd != null) // 关联上一个table { - string[] str = va.Value.ToString().Split('/'); + string[] str = fieldValue.Split('/'); string value = string.Empty; if (str.Length == 3) { @@ -424,49 +458,73 @@ private ISugarQueryable sugarQueryable(string subtable, string se conModels.Add(new ConditionalModel() { FieldName = vakey.TrimEnd('@'), ConditionalType = ConditionalType.Equal, FieldValue = value }); } - else if (IsCol(subtable,vakey)) //其他where条件 + else if (IsCol(subtable, vakey)) //其他where条件 { - conModels.Add(new ConditionalModel() { FieldName = vakey, ConditionalType = ConditionalType.Equal, FieldValue = va.Value.ToString() }); + conModels.Add(new ConditionalModel() { FieldName = vakey, ConditionalType = ConditionalType.Equal, FieldValue = fieldValue }); } } tb.Where(conModels); //排序 - if (values["@order"].IsValue()) + ProcessOrder(subtable, values, tb); + + //分组 + PrccessGroup(subtable, values, tb); + + //Having + ProcessHaving(values, tb); + return tb; + } + + //处理字段重命名 "@column":"toId:parentId"，对应SQL是toId AS parentId，将查询的字段toId变为parentId返回 + private void ProcessColumn(string subtable, string selectrole, JObject values, ISugarQueryable tb) + { + var str = new System.Text.StringBuilder(100); + foreach (var item in values["@column"].ToString().Split(',')) { - foreach (var item in values["@order"].ToString().Split(',')) + string[] ziduan = item.Split(':'); + string colName = ziduan[0]; + var ma = new Regex(@"\((\w+)\)").Match(colName); + //处理max，min这样的函数 + if (ma.Success && ma.Groups.Count > 1) { - if (IsCol(subtable,item.Replace("-", ""))) - { - if (item.EndsWith("-")) - { - tb.OrderBy($"{item.Replace("-", " desc")}"); - } - else - { - tb.OrderBy($"{item.ToString()}"); - } - } + colName = ma.Groups[1].Value; } - } - if (values["@group"].IsValue()) - { - var str = new System.Text.StringBuilder(100); - foreach (var and in values["@group"].ToString().Split(',')) + //判断列表是否有权限 sum(1)，sum(*),Count(1)这样的值直接有效 + if (colName == "*" || int.TryParse(colName, out int colNumber) || (IsCol(subtable, colName) && _identitySvc.ColIsRole(colName, selectrole.Split(',')))) { - if (IsCol(subtable, and)) - { - str.Append(and + ","); - } + if (ziduan.Length > 1) + str.Append(ziduan[0] + " as " + ziduan[1] + ","); + else + str.Append(ziduan[0] + ","); + } - tb.GroupBy(str.ToString().TrimEnd(',')); } + if (string.IsNullOrEmpty(str.ToString())) + { + throw new Exception($"表名{subtable}没有可查询的字段！"); + } + tb.Select(str.ToString().TrimEnd(',')); + } + + // "@having":"function0(...)?value0;function1(...)?value1;function2(...)?value2..."， + // SQL函数条件，一般和 @group一起用，函数一般在 @column里声明 + private void ProcessHaving(JObject values, ISugarQueryable tb) + { if (values["@having"].IsValue()) { List hw = new List(); - JArray jArray = JArray.Parse(values["@having"].ToString()); - foreach (var item in jArray) + List havingItems = new List(); + if (values["@having"].HasValues) + { + havingItems = values["@having"].Select(p => p.ToString()).ToList(); + } + else + { + havingItems.Add(values["@having"].ToString()); + } + foreach (var item in havingItems) { string and = item.ToString(); var model = new ConditionalModel(); @@ -478,7 +536,7 @@ private ISugarQueryable sugarQueryable(string subtable, string se } else if (and.Contains("<=")) { - + model.FieldName = and.Split(new string[] { "<=" }, StringSplitOptions.RemoveEmptyEntries)[0]; model.ConditionalType = ConditionalType.LessThanOrEqual; model.FieldValue = and.Split(new string[] { "<=" }, StringSplitOptions.RemoveEmptyEntries)[1]; @@ -511,9 +569,180 @@ private ISugarQueryable sugarQueryable(string subtable, string se } var d = db.Context.Utilities.ConditionalModelToSql(hw); - tb.Having(d.Key, d.Value); + //tb.Having(d.Key, d.Value); + tb.Having(string.Join(",", havingItems)); + } + } + + //"@group":"column0,column1..."，分组方式。如果 @column里声明了Table的id，则id也必须在 @group中声明；其它情况下必须满足至少一个条件: + //1.分组的key在 @column里声明 + //2.Table主键在 @group中声明 + private void PrccessGroup(string subtable, JObject values, ISugarQueryable tb) + { + if (values["@group"].IsValue()) + { + var str = new System.Text.StringBuilder(100); + foreach (var and in values["@group"].ToString().Split(',')) + { + if (IsCol(subtable, and)) + { + str.Append(and + ","); + } + } + tb.GroupBy(str.ToString().TrimEnd(',')); + } + } + + //处理排序 "@order":"name-,id"查询按 name降序、id默认顺序 排序的User数组 + private void ProcessOrder(string subtable, JObject values, ISugarQueryable tb) + { + if (values["@order"].IsValue()) + { + foreach (var item in values["@order"].ToString().Split(',')) + { + string col = item.Replace("-", "").Replace("+", ""); + if (IsCol(subtable, col)) + { + if (item.EndsWith("-")) + { + tb.OrderBy($"{col} desc"); + } + else if (item.EndsWith("+")) + { + tb.OrderBy($"{col} asc"); + } + else + { + tb.OrderBy($"{col}"); + } + } + } + } + } + + //条件查询 "key{}":"条件0,条件1..."，条件为任意SQL比较表达式字符串，非Number类型必须用''包含条件的值，如'a' + //&, |, ! 逻辑运算符，对应数据库 SQL 中的 AND, OR, NOT。 + // 横或纵与：同一字段的值内条件默认 | 或连接，不同字段的条件默认 & 与连接。 + // ① & 可用于"key&{}":"条件"等 + // ② | 可用于"key|{}":"条件", "key|{}":[] 等，一般可省略 + // ③ ! 可单独使用，如"key!":Object，也可像&,|一样配合其他功能符使用 + private void ConditionQuery(string subtable, List conModels, KeyValuePair va) + { + string vakey = va.Key.Trim(); + string field = vakey.TrimEnd("{}".ToCharArray()); + if (va.Value.HasValues) + { + List inValues = new List(); + foreach (var cm in va.Value) + { + inValues.Add(cm.ToString()); + } + + conModels.Add(new ConditionalModel() { FieldName = field, ConditionalType = field.EndsWith("!") ? ConditionalType.NotIn : ConditionalType.In, FieldValue = string.Join(",", inValues) }); + + } + else + { + var ddt = new List>(); + foreach (var and in va.Value.ToString().Split(',')) + { + var model = new ConditionalModel(); + model.FieldName = field.TrimEnd("&".ToCharArray());//处理&()的查询方式 + if (and.StartsWith(">=")) + { + model.ConditionalType = ConditionalType.GreaterThanOrEqual; + model.FieldValue = and.TrimStart(">=".ToCharArray()); + } + else if (and.StartsWith("<=")) + { + + model.ConditionalType = ConditionalType.LessThanOrEqual; + model.FieldValue = and.TrimStart("<=".ToCharArray()); + } + else if (and.StartsWith(">")) + { + model.ConditionalType = ConditionalType.GreaterThan; + model.FieldValue = and.TrimStart('>'); + } + else if (and.StartsWith("<")) + { + model.ConditionalType = ConditionalType.LessThan; + model.FieldValue = and.TrimStart('<'); + } + ddt.Add(new KeyValuePair((field.EndsWith("&") ? WhereType.And : WhereType.Or), model)); + } + conModels.Add(new ConditionalCollections() { ConditionalList = ddt }); + } + } + + //"key%":"start,end" => "key%":["start,end"]，其中 start 和 end 都只能为 Boolean, Number, String 中的一种，如 "2017-01-01,2019-01-01" ，["1,90000", "82001,100000"] ，可用于连续范围内的筛选 + private void ConditionBetween(string subtable, List conModels, KeyValuePair va) + { + string vakey = va.Key.Trim(); + string field = vakey.TrimEnd("%".ToCharArray()); + List inValues = new List(); + + if (va.Value.HasValues) + { + foreach (var cm in va.Value) + { + inValues.Add(cm.ToString()); + } + } + else + { + inValues.Add(va.Value.ToString()); + } + for (var i = 0; i < inValues.Count; i++) + { + var fileds = inValues[i].Split(','); + if (fileds.Length == 2) + { + var ddt = new List>(); + + var leftCondition = new ConditionalModel() + { + FieldName = field, + ConditionalType = ConditionalType.GreaterThanOrEqual, + FieldValue = fileds[0] + }; + ddt.Add(new KeyValuePair(i == 0 ? WhereType.And : WhereType.Or, leftCondition)); + var rightCondition = new ConditionalModel() + { + FieldName = field, + ConditionalType = ConditionalType.LessThanOrEqual, + FieldValue = fileds[1] + }; + ddt.Add(new KeyValuePair(WhereType.And, rightCondition)); + + conModels.Add(new ConditionalCollections() { ConditionalList = ddt }); + } + } + } + + //模糊搜索 "key$":"SQL搜索表达式" => "key$":["SQL搜索表达式"]，任意SQL搜索表达式字符串，如 %key%(包含key), key%(以key开始), %k%e%y%(包含字母k,e,y) 等，%表示任意字符 + private void FuzzyQuery(string subtable, List conModels, KeyValuePair va) + { + string vakey = va.Key.Trim(); + string fieldValue = va.Value.ToString(); + var conditionalType = ConditionalType.Like; + if (IsCol(subtable, vakey.TrimEnd('$'))) + { + //支持三种like查询 + if (fieldValue.StartsWith("%") && fieldValue.EndsWith("%")) + { + conditionalType = ConditionalType.Like; + } + else if (fieldValue.StartsWith("%")) + { + conditionalType = ConditionalType.LikeRight; + } + else if (fieldValue.EndsWith("%")) + { + conditionalType = ConditionalType.LikeLeft; + } + conModels.Add(new ConditionalModel() { FieldName = vakey.TrimEnd('$'), ConditionalType = conditionalType, FieldValue = fieldValue.TrimEnd("%".ToArray()).TrimStart("%".ToArray()) }); } - return tb; } } } diff --git a/APIJSON.NET/APIJSONCommon/Services/IIdentityService.cs b/APIJSON.NET/APIJSONCommon/Services/IIdentityService.cs index d34d26e..d911702 100644 --- a/APIJSON.NET/APIJSONCommon/Services/IIdentityService.cs +++ b/APIJSON.NET/APIJSONCommon/Services/IIdentityService.cs @@ -1,4 +1,5 @@ using APIJSON.NET.Models; +using System; namespace APIJSON.NET.Services { @@ -24,7 +25,7 @@ public interface IIdentityService /// /// /// - (bool, string) GetSelectRole(string table); + Tuple GetSelectRole(string table); bool ColIsRole(string col, string[] selectrole); diff --git a/APIJSON.NET/APIJSONCommon/app.config b/APIJSON.NET/APIJSONCommon/app.config new file mode 100644 index 0000000..2bbe771 --- /dev/null +++ b/APIJSON.NET/APIJSONCommon/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/APIJSON.NET/APIJSONCommon/packages.config b/APIJSON.NET/APIJSONCommon/packages.config new file mode 100644 index 0000000..deca899 --- /dev/null +++ b/APIJSON.NET/APIJSONCommon/packages.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file