diff --git a/Src/Asp.Net/SqlSugar/Json2Sql/JsonToModel/JsonToColumnsModels.cs b/Src/Asp.Net/SqlSugar/Json2Sql/JsonToModel/JsonToColumnsModels.cs index 74869b76c..6004927a3 100644 --- a/Src/Asp.Net/SqlSugar/Json2Sql/JsonToModel/JsonToColumnsModels.cs +++ b/Src/Asp.Net/SqlSugar/Json2Sql/JsonToModel/JsonToColumnsModels.cs @@ -55,8 +55,8 @@ namespace SqlSugar if (item.Value == null) return null; var valueString = item.Value.ToString(); - var vallue = SqlValueHelper.GetValue(valueString); - var type = SqlValueHelper.GetType(valueString); + var vallue = Json2SqlHelper.GetValue(valueString); + var type = Json2SqlHelper.GetType(valueString); return UtilMethods.ConvertDataByTypeName(type,vallue); } } diff --git a/Src/Asp.Net/SqlSugar/Json2Sql/ModelToSql/SqlPart.cs b/Src/Asp.Net/SqlSugar/Json2Sql/ModelToSql/SqlPart.cs index 3b1d6b8dc..153ed3b09 100644 --- a/Src/Asp.Net/SqlSugar/Json2Sql/ModelToSql/SqlPart.cs +++ b/Src/Asp.Net/SqlSugar/Json2Sql/ModelToSql/SqlPart.cs @@ -76,7 +76,7 @@ namespace SqlSugar private string GetSqlPartByString(object value, List pars) { var valueString = value.ObjToString().Trim(); - if (SqlValueHelper.IsSqlValue(valueString)) + if (Json2SqlHelper.IsSqlValue(valueString)) { return GetParameterName(pars, valueString); } @@ -105,9 +105,9 @@ namespace SqlSugar } private string GetParameterName(List pars, string valueString) { - object parvalue = SqlValueHelper.GetValue(valueString); + object parvalue = Json2SqlHelper.GetValue(valueString); SugarParameter parameter = new SugarParameter("@p" + pars.Count(), parvalue); - var type = SqlValueHelper.GetType(valueString); + var type = Json2SqlHelper.GetType(valueString); parvalue = UtilMethods.ConvertDataByTypeName(type, parvalue.ObjToString()); var parname = GetParameterName(pars, parvalue); return parname; diff --git a/Src/Asp.Net/SqlSugar/Json2Sql/Utils/Json2SqlHelper.cs b/Src/Asp.Net/SqlSugar/Json2Sql/Utils/Json2SqlHelper.cs new file mode 100644 index 000000000..3d2448809 --- /dev/null +++ b/Src/Asp.Net/SqlSugar/Json2Sql/Utils/Json2SqlHelper.cs @@ -0,0 +1,39 @@ +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Text; +using System.Text.RegularExpressions; +using System.Linq; +namespace SqlSugar +{ + internal class Json2SqlHelper + { + public static bool IsSqlValue(string valueString) + { + return Regex.IsMatch(valueString, @"^\{\w{1,10}\}\:"); + } + public static string GetType(string valueString) + { + return Regex.Match(valueString, @"^\{(\w+)\}\:").Groups[1].Value; + } + public static string GetValue(string valueString) + { + return Regex.Replace(valueString, @"^\{\w{1,10}\}\:", ""); + } + + public static List GetTableNames(string json) + { + List result = new List(); + var mainTable = JObject.Parse(json).AsJEnumerable().Where(it => + it.Path.ToLower().IsIn( + JsonProviderConfig.KeyInsertable.Get().ToLower(), + JsonProviderConfig.KeyUpdateable.Get().ToLower(), + JsonProviderConfig.KeyDeleteable.Get().ToLower(), + JsonProviderConfig.KeyQueryable.Get().ToLower() + )).FirstOrDefault(); + if (mainTable != null) + result.Add(mainTable.First().ToString()); + return result; + } + } +} diff --git a/Src/Asp.Net/SqlSugar/Json2Sql/Utils/JsonPublicMethod.cs b/Src/Asp.Net/SqlSugar/Json2Sql/Utils/JsonPublicMethod.cs deleted file mode 100644 index cdaccdc03..000000000 --- a/Src/Asp.Net/SqlSugar/Json2Sql/Utils/JsonPublicMethod.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Text.RegularExpressions; - -namespace SqlSugar -{ - internal class SqlValueHelper - { - public static bool IsSqlValue(string valueString) - { - return Regex.IsMatch(valueString, @"^\{\w{1,10}\}\:"); - } - public static string GetType(string valueString) - { - return Regex.Match(valueString, @"^\{(\w+)\}\:").Groups[1].Value; - } - public static string GetValue(string valueString) - { - return Regex.Replace(valueString, @"^\{\w{1,10}\}\:", ""); - } - - } -} diff --git a/Src/Asp.Net/SqlSugar/JsonClient.cs b/Src/Asp.Net/SqlSugar/JsonClient.cs index c4a6e3329..aee30582d 100644 --- a/Src/Asp.Net/SqlSugar/JsonClient.cs +++ b/Src/Asp.Net/SqlSugar/JsonClient.cs @@ -31,16 +31,7 @@ namespace SqlSugar } public List GetTableNameList(string json) { - List result = new List(); - var mainTable = JObject.Parse(json).AsJEnumerable().Where(it => - it.Path.ToLower().IsIn( - JsonProviderConfig.KeyInsertable.Get().ToLower(), - JsonProviderConfig.KeyUpdateable.Get().ToLower(), - JsonProviderConfig.KeyDeleteable.Get().ToLower(), - JsonProviderConfig.KeyQueryable.Get().ToLower() - )).FirstOrDefault(); - if (mainTable != null) - result.Add(mainTable.First().ToString()); + List result = Json2SqlHelper.GetTableNames(json); return result; } }