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

Update query json

Browse Source
This commit is contained in:
sunkaixuan
2022-05-10 13:15:21 +08:00
parent f2165d5dcc
commit 545bb81900
2 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs
View File

@@ -472,6 +472,15 @@ namespace SqlSugar
{ {
asName = GetAsName(item, shortName, property); asName = GetAsName(item, shortName, property);
} }
else if (comumnInfo!=null&&this.Context.SugarContext != null&&this.Context.SugarContext.Context != null)
{
var entityInfo=this.Context.SugarContext.Context.EntityMaintenance.GetEntityInfo(item.Type);
var entityColumn = entityInfo.Columns.FirstOrDefault(it => it.PropertyName == property.Name);
if (entityColumn != null && entityColumn.IsJson)
{
asName = GetAsName(item, shortName, property);
}
}
} }
else if (isSameType) else if (isSameType)
{ {

54
Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs
View File

@@ -394,6 +394,7 @@ namespace SqlSugar
return null; return null;
} }
var classProperties = type.GetProperties().ToList(); var classProperties = type.GetProperties().ToList();
var columns = this.Context.EntityMaintenance.GetEntityInfo(type).Columns;
foreach (var prop in classProperties) foreach (var prop in classProperties)
{ {
var name = prop.Name; var name = prop.Name;
@@ -403,29 +404,14 @@ namespace SqlSugar
var suagrColumn=prop.GetCustomAttribute<SugarColumn>(); var suagrColumn=prop.GetCustomAttribute<SugarColumn>();
if (suagrColumn != null && suagrColumn.IsJson) if (suagrColumn != null && suagrColumn.IsJson)
{ {
var key = (typeName + "." + name).ToLower(); Json(readerValues, result, name, typeName);
if (readerValues.Any(it=>it.Key.EqualCase(key)))
{
var jsonString = readerValues.First(it => it.Key.EqualCase(key)).Value;
if (jsonString != null)
{
if (jsonString.ToString().First() == '{' && jsonString.ToString().Last() == '}')
{
result.Add(name, this.DeserializeObject<Dictionary<string, object>>(jsonString + ""));
} }
else if (jsonString.ToString().Replace(" ","")!="[]"&&!jsonString.ToString().Contains("{")&&!jsonString.ToString().Contains("}")) else if (columns.Any(it => it.IsJson))
{ {
result.Add(name, this.DeserializeObject<dynamic>(jsonString + "")); var column = columns.FirstOrDefault(it => it.PropertyName == name);
} if (column != null && column.IsJson)
else
{
result.Add(name, this.DeserializeObject<List<Dictionary<string, object>>>(jsonString + ""));
}
}
}
else
{ {
Json(readerValues, result, name, typeName);
} }
} }
else else
@@ -462,6 +448,34 @@ namespace SqlSugar
} }
return result; return result;
} }
private void Json(Dictionary<string, object> readerValues, Dictionary<string, object> result, string name, string typeName)
{
var key = (typeName + "." + name).ToLower();
if (readerValues.Any(it => it.Key.EqualCase(key)))
{
var jsonString = readerValues.First(it => it.Key.EqualCase(key)).Value;
if (jsonString != null)
{
if (jsonString.ToString().First() == '{' && jsonString.ToString().Last() == '}')
{
result.Add(name, this.DeserializeObject<Dictionary<string, object>>(jsonString + ""));
}
else if (jsonString.ToString().Replace(" ", "") != "[]" && !jsonString.ToString().Contains("{") && !jsonString.ToString().Contains("}"))
{
result.Add(name, this.DeserializeObject<dynamic>(jsonString + ""));
}
else
{
result.Add(name, this.DeserializeObject<List<Dictionary<string, object>>>(jsonString + ""));
}
}
}
else
{
}
}
#endregion #endregion
#region Serialize #region Serialize