wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在FormDataParsing单独使用新的SugarClient实例

Browse Source
This commit is contained in:
潘飞
2023-03-30 14:54:09 +08:00
parent 0a6fba29cd
commit ba4fbbd6e2
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
visualdev/Tnb.VisualDev.Engine/Core/FormDataParsing.cs
View File

@@ -63,7 +63,8 @@ public class FormDataParsing : ITransient
/// <summary> /// <summary>
/// 服务基础仓储. /// 服务基础仓储.
/// </summary> /// </summary>
private readonly ISqlSugarRepository<VisualDevEntity> _db; //private readonly ISqlSugarRepository<VisualDevEntity> _db;
private readonly ISqlSugarClient _sugar;
/// <summary> /// <summary>
/// 构造. /// 构造.
@@ -85,7 +86,8 @@ public class FormDataParsing : ITransient
_cacheManager = cacheManager; _cacheManager = cacheManager;
_databaseService = databaseService; _databaseService = databaseService;
_dataInterfaceService = dataInterfaceService; _dataInterfaceService = dataInterfaceService;
_db = context; _sugar = context.AsSugarClient().CopyNew();
//_db = context;
_memCache = memCache; _memCache = memCache;
} }
#endregion #endregion
@@ -629,7 +631,7 @@ public class FormDataParsing : ITransient
case JnpfKeyConst.POSSELECT: // 岗位 case JnpfKeyConst.POSSELECT: // 岗位
if (!GetCacheValues(fieldCacheKey, templateData)) if (!GetCacheValues(fieldCacheKey, templateData))
{ {
List<PositionEntity>? positionEntityList = await _db.AsSugarClient().Queryable<PositionEntity>().Where(u => u.DeleteMark == null).ToListAsync(); List<PositionEntity>? positionEntityList = await _sugar.Queryable<PositionEntity>().Where(u => u.DeleteMark == null).ToListAsync();
List<Dictionary<string, string>> positionList = new List<Dictionary<string, string>>(); List<Dictionary<string, string>> positionList = new List<Dictionary<string, string>>();
foreach (PositionEntity? item in positionEntityList) foreach (PositionEntity? item in positionEntityList)
{ {
@@ -646,7 +648,7 @@ public class FormDataParsing : ITransient
case JnpfKeyConst.GROUPSELECT: // 分组 case JnpfKeyConst.GROUPSELECT: // 分组
if (!GetCacheValues(fieldCacheKey, templateData)) if (!GetCacheValues(fieldCacheKey, templateData))
{ {
List<GroupEntity>? positionEntityList = await _db.AsSugarClient().Queryable<GroupEntity>().Where(u => u.DeleteMark == null).ToListAsync(); List<GroupEntity>? positionEntityList = await _sugar.Queryable<GroupEntity>().Where(u => u.DeleteMark == null).ToListAsync();
List<Dictionary<string, string>> positionList = new List<Dictionary<string, string>>(); List<Dictionary<string, string>> positionList = new List<Dictionary<string, string>>();
foreach (GroupEntity? item in positionEntityList) foreach (GroupEntity? item in positionEntityList)
{ {
@@ -663,7 +665,7 @@ public class FormDataParsing : ITransient
case JnpfKeyConst.ROLESELECT: // 角色 case JnpfKeyConst.ROLESELECT: // 角色
if (!GetCacheValues(fieldCacheKey, templateData)) if (!GetCacheValues(fieldCacheKey, templateData))
{ {
List<RoleEntity>? positionEntityList = await _db.AsSugarClient().Queryable<RoleEntity>().Where(u => u.DeleteMark == null).ToListAsync(); List<RoleEntity>? positionEntityList = await _sugar.Queryable<RoleEntity>().Where(u => u.DeleteMark == null).ToListAsync();
List<Dictionary<string, string>> positionList = new List<Dictionary<string, string>>(); List<Dictionary<string, string>> positionList = new List<Dictionary<string, string>>();
foreach (RoleEntity? item in positionEntityList) foreach (RoleEntity? item in positionEntityList)
{ {
@@ -697,7 +699,7 @@ public class FormDataParsing : ITransient
} }
else else
{ {
List<ProvinceEntity>? addressEntityList = await _db.AsSugarClient().Queryable<ProvinceEntity>().Select(x => new ProvinceEntity { Id = x.Id, ParentId = x.ParentId, Type = x.Type, FullName = x.FullName }).ToListAsync(); List<ProvinceEntity>? addressEntityList = await _sugar.Queryable<ProvinceEntity>().Select(x => new ProvinceEntity { Id = x.Id, ParentId = x.ParentId, Type = x.Type, FullName = x.FullName }).ToListAsync();
// 处理省市区树 // 处理省市区树
addressEntityList.Where(x => x.Type == "1").ToList().ForEach(item => item.QuickQuery = item.FullName); addressEntityList.Where(x => x.Type == "1").ToList().ForEach(item => item.QuickQuery = item.FullName);
@@ -739,7 +741,7 @@ public class FormDataParsing : ITransient
} }
else else
{ {
List<ProvinceEntity>? addressEntityList = await _db.AsSugarClient().Queryable<ProvinceEntity>().Select(x => new ProvinceEntity { Id = x.Id, ParentId = x.ParentId, Type = x.Type, FullName = x.FullName }).ToListAsync(); List<ProvinceEntity>? addressEntityList = await _sugar.Queryable<ProvinceEntity>().Select(x => new ProvinceEntity { Id = x.Id, ParentId = x.ParentId, Type = x.Type, FullName = x.FullName }).ToListAsync();
// 处理省市区树 // 处理省市区树
addressEntityList.Where(x => x.Type == "1").ToList().ForEach(item => item.QuickQuery = item.FullName); addressEntityList.Where(x => x.Type == "1").ToList().ForEach(item => item.QuickQuery = item.FullName);
@@ -795,7 +797,7 @@ public class FormDataParsing : ITransient
} }
else else
{ {
List<UserEntity>? userEntityList = await _db.AsSugarClient().Queryable<UserEntity>().Where(x => x.DeleteMark == null).Select(x => new UserEntity() { Id = x.Id, RealName = x.RealName, Account = x.Account }).ToListAsync(); List<UserEntity>? userEntityList = await _sugar.Queryable<UserEntity>().Where(x => x.DeleteMark == null).Select(x => new UserEntity() { Id = x.Id, RealName = x.RealName, Account = x.Account }).ToListAsync();
List<Dictionary<string, string>> userList = new List<Dictionary<string, string>>(); List<Dictionary<string, string>> userList = new List<Dictionary<string, string>>();
foreach (UserEntity? item in userEntityList) foreach (UserEntity? item in userEntityList)
@@ -821,32 +823,32 @@ public class FormDataParsing : ITransient
else else
{ {
var addList = new List<Dictionary<string, string>>(); var addList = new List<Dictionary<string, string>>();
(await _db.AsSugarClient().Queryable<UserEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.RealName, x.Account }).ToListAsync()).ForEach(item => (await _sugar.Queryable<UserEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.RealName, x.Account }).ToListAsync()).ForEach(item =>
{ {
Dictionary<string, string> user = new Dictionary<string, string>(); Dictionary<string, string> user = new Dictionary<string, string>();
user.Add(item.Id + "--user", item.RealName + "/" + item.Account); user.Add(item.Id + "--user", item.RealName + "/" + item.Account);
addList.Add(user); addList.Add(user);
}); });
(await _db.AsSugarClient().Queryable<OrganizeEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.FullName }).ToListAsync()).ForEach(item => (await _sugar.Queryable<OrganizeEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.FullName }).ToListAsync()).ForEach(item =>
{ {
Dictionary<string, string> user = new Dictionary<string, string>(); Dictionary<string, string> user = new Dictionary<string, string>();
user.Add(item.Id + "--company", item.FullName); user.Add(item.Id + "--company", item.FullName);
user.Add(item.Id + "--department", item.FullName); user.Add(item.Id + "--department", item.FullName);
addList.Add(user); addList.Add(user);
}); });
(await _db.AsSugarClient().Queryable<RoleEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.FullName }).ToListAsync()).ForEach(item => (await _sugar.Queryable<RoleEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.FullName }).ToListAsync()).ForEach(item =>
{ {
Dictionary<string, string> user = new Dictionary<string, string>(); Dictionary<string, string> user = new Dictionary<string, string>();
user.Add(item.Id + "--role", item.FullName); user.Add(item.Id + "--role", item.FullName);
addList.Add(user); addList.Add(user);
}); });
(await _db.AsSugarClient().Queryable<PositionEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.FullName }).ToListAsync()).ForEach(item => (await _sugar.Queryable<PositionEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.FullName }).ToListAsync()).ForEach(item =>
{ {
Dictionary<string, string> user = new Dictionary<string, string>(); Dictionary<string, string> user = new Dictionary<string, string>();
user.Add(item.Id + "--position", item.FullName); user.Add(item.Id + "--position", item.FullName);
addList.Add(user); addList.Add(user);
}); });
(await _db.AsSugarClient().Queryable<GroupEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.FullName }).ToListAsync()).ForEach(item => (await _sugar.Queryable<GroupEntity>().Where(x => x.DeleteMark == null).Select(x => new { x.Id, x.FullName }).ToListAsync()).ForEach(item =>
{ {
Dictionary<string, string> user = new Dictionary<string, string>(); Dictionary<string, string> user = new Dictionary<string, string>();
user.Add(item.Id + "--group", item.FullName); user.Add(item.Id + "--group", item.FullName);
@@ -892,7 +894,7 @@ public class FormDataParsing : ITransient
{ {
if (!GetCacheValues(fieldCacheKey, templateData)) if (!GetCacheValues(fieldCacheKey, templateData))
{ {
List<OrganizeEntity>? dep_organizeEntityList = await _db.AsSugarClient().Queryable<OrganizeEntity>().Where(d => d.EnabledMark == 1 && d.DeleteMark == null) List<OrganizeEntity>? dep_organizeEntityList = await _sugar.Queryable<OrganizeEntity>().Where(d => d.EnabledMark == 1 && d.DeleteMark == null)
.WhereIF(orgType.Equals(JnpfKeyConst.DEPSELECT), d => d.Category.Equals("department")).ToListAsync(); .WhereIF(orgType.Equals(JnpfKeyConst.DEPSELECT), d => d.Category.Equals("department")).ToListAsync();
List<Dictionary<string, object>> vlist = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> vlist = new List<Dictionary<string, object>>();
@@ -962,7 +964,7 @@ public class FormDataParsing : ITransient
parameter.Add(new SugarParameter("@currentChargeorganizationAndSuborganization", subsidiary)); parameter.Add(new SugarParameter("@currentChargeorganizationAndSuborganization", subsidiary));
} }
DbLinkEntity? linkEntity = await _db.AsSugarClient().Queryable<DbLinkEntity>().Where(m => m.Id == dynamic.DBLinkId && m.DeleteMark == null).FirstAsync(); DbLinkEntity? linkEntity = await _sugar.Queryable<DbLinkEntity>().Where(m => m.Id == dynamic.DBLinkId && m.DeleteMark == null).FirstAsync();
if (linkEntity == null) linkEntity = _databaseService.GetTenantDbLink(_userManager.TenantId, _userManager.TenantDbName); if (linkEntity == null) linkEntity = _databaseService.GetTenantDbLink(_userManager.TenantId, _userManager.TenantDbName);
_dataInterfaceService.ReplaceParameterValue(dynamic, new Dictionary<string, string>()); _dataInterfaceService.ReplaceParameterValue(dynamic, new Dictionary<string, string>());
System.Data.DataTable? dt = _databaseService.GetInterFaceData(linkEntity, dynamic.Query, parameter.ToArray()); System.Data.DataTable? dt = _databaseService.GetInterFaceData(linkEntity, dynamic.Query, parameter.ToArray());
@@ -1072,7 +1074,7 @@ public class FormDataParsing : ITransient
/// <returns>List.</returns> /// <returns>List.</returns>
private async Task<List<Dictionary<string, string>>> GetDictionaryList(string? dictionaryTypeId = null) private async Task<List<Dictionary<string, string>>> GetDictionaryList(string? dictionaryTypeId = null)
{ {
List<DictionaryDataEntity> dictionaryDataEntityList = await _db.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>((a, b) => new JoinQueryInfos(JoinType.Left, b.Id == a.DictionaryTypeId)) List<DictionaryDataEntity> dictionaryDataEntityList = await _sugar.Queryable<DictionaryDataEntity, DictionaryTypeEntity>((a, b) => new JoinQueryInfos(JoinType.Left, b.Id == a.DictionaryTypeId))
.WhereIF(dictionaryTypeId.IsNotEmptyOrNull(), (a, b) => b.Id == dictionaryTypeId || b.EnCode == dictionaryTypeId).Where(a => a.DeleteMark == null).ToListAsync(); .WhereIF(dictionaryTypeId.IsNotEmptyOrNull(), (a, b) => b.Id == dictionaryTypeId || b.EnCode == dictionaryTypeId).Where(a => a.DeleteMark == null).ToListAsync();
List<Dictionary<string, string>> dictionaryDataList = new List<Dictionary<string, string>>(); List<Dictionary<string, string>> dictionaryDataList = new List<Dictionary<string, string>>();
@@ -1193,10 +1195,10 @@ public class FormDataParsing : ITransient
break; break;
case JnpfKeyConst.CREATEUSER: case JnpfKeyConst.CREATEUSER:
case JnpfKeyConst.MODIFYUSER: case JnpfKeyConst.MODIFYUSER:
dataMap[key] = await _db.AsSugarClient().Queryable<UserEntity>().Where(x => x.Id == dataValue).Select(x => SqlFunc.MergeString(x.RealName, "/", x.Account)).FirstAsync(); dataMap[key] = await _sugar.Queryable<UserEntity>().Where(x => x.Id == dataValue).Select(x => SqlFunc.MergeString(x.RealName, "/", x.Account)).FirstAsync();
break; break;
case JnpfKeyConst.CURRPOSITION: case JnpfKeyConst.CURRPOSITION:
dataMap[key] = (await _db.AsSugarClient().Queryable<PositionEntity>().FirstAsync(p => p.Id == dataMap[key].ToString()))?.FullName; dataMap[key] = (await _sugar.Queryable<PositionEntity>().FirstAsync(p => p.Id == dataMap[key].ToString()))?.FullName;
if (dataMap[key].IsNullOrEmpty()) dataMap[key] = " "; if (dataMap[key].IsNullOrEmpty()) dataMap[key] = " ";
break; break;
case JnpfKeyConst.CURRORGANIZE: case JnpfKeyConst.CURRORGANIZE:
@@ -1429,7 +1431,7 @@ public class FormDataParsing : ITransient
if (webType == 3) if (webType == 3)
{ {
var ids = list.Select(x => x[primaryKey]).ToList(); var ids = list.Select(x => x[primaryKey]).ToList();
var flowTaskList = await _db.AsSugarClient().Queryable<FlowTaskEntity>().Where(x => ids.Contains(x.Id)).Select(x => new FlowTaskEntity() { Id = x.Id, Status = x.Status }).ToListAsync(); var flowTaskList = await _sugar.Queryable<FlowTaskEntity>().Where(x => ids.Contains(x.Id)).Select(x => new FlowTaskEntity() { Id = x.Id, Status = x.Status }).ToListAsync();
list.ForEach(item => list.ForEach(item =>
{ {
if (flowTaskList.Any(x => x.Id.Equals(item[primaryKey].ToString()))) if (flowTaskList.Any(x => x.Id.Equals(item[primaryKey].ToString())))
@@ -1718,7 +1720,7 @@ public class FormDataParsing : ITransient
dataMap[key] = await _memCache.GetOrCreateAsync($"organizeId_{dataValue}", async entry => dataMap[key] = await _memCache.GetOrCreateAsync($"organizeId_{dataValue}", async entry =>
{ {
entry.SlidingExpiration = TimeSpan.FromSeconds(60); entry.SlidingExpiration = TimeSpan.FromSeconds(60);
return (await _db.AsSugarClient().Queryable<OrganizeEntity>().FirstAsync(x => x.Id == dataValue.ToString()))?.FullName; return (await _sugar.Queryable<OrganizeEntity>().FirstAsync(x => x.Id == dataValue.ToString()))?.FullName;
}); });
break; break;
case JnpfKeyConst.MODIFYUSER: case JnpfKeyConst.MODIFYUSER:
@@ -1726,7 +1728,7 @@ public class FormDataParsing : ITransient
dataMap[key] = await _memCache.GetOrCreateAsync($"userId_{dataValue}", async entry => dataMap[key] = await _memCache.GetOrCreateAsync($"userId_{dataValue}", async entry =>
{ {
entry.SlidingExpiration = TimeSpan.FromSeconds(60); entry.SlidingExpiration = TimeSpan.FromSeconds(60);
return await _db.AsSugarClient().Queryable<UserEntity>().Where(x => x.Id == dataValue.ToString()).Select(x => SqlFunc.MergeString(x.RealName, "/", x.Account)).FirstAsync(); return await _sugar.Queryable<UserEntity>().Where(x => x.Id == dataValue.ToString()).Select(x => SqlFunc.MergeString(x.RealName, "/", x.Account)).FirstAsync();
}); });
break; break;
case JnpfKeyConst.MODIFYTIME: case JnpfKeyConst.MODIFYTIME:
@@ -1737,7 +1739,7 @@ public class FormDataParsing : ITransient
dataMap[key] = await _memCache.GetOrCreateAsync($"positionId_{dataValue}", async entry => dataMap[key] = await _memCache.GetOrCreateAsync($"positionId_{dataValue}", async entry =>
{ {
entry.SlidingExpiration = TimeSpan.FromSeconds(60); entry.SlidingExpiration = TimeSpan.FromSeconds(60);
return (await _db.AsSugarClient().Queryable<PositionEntity>().FirstAsync(x => x.Id == dataValue.ToString()))?.FullName; return (await _sugar.Queryable<PositionEntity>().FirstAsync(x => x.Id == dataValue.ToString()))?.FullName;
}); });
break; break;
case JnpfKeyConst.POPUPTABLESELECT: case JnpfKeyConst.POPUPTABLESELECT:
@@ -1891,7 +1893,7 @@ public class FormDataParsing : ITransient
else else
{ {
// 根据可视化功能ID获取该模板全部数据 // 根据可视化功能ID获取该模板全部数据
var relationFormModel = await _db.AsSugarClient().Queryable<VisualDevEntity>().FirstAsync(v => v.Id == model.modelId); var relationFormModel = await _sugar.Queryable<VisualDevEntity>().FirstAsync(v => v.Id == model.modelId);
var newFieLdsModelList = relationFormModel.FormData.ToObject<FormDataModel>().fields.FindAll(x => model.relationField.Equals(x.__vModel__)); var newFieLdsModelList = relationFormModel.FormData.ToObject<FormDataModel>().fields.FindAll(x => model.relationField.Equals(x.__vModel__));
VisualDevModelListQueryInput listQueryInput = new VisualDevModelListQueryInput VisualDevModelListQueryInput listQueryInput = new VisualDevModelListQueryInput
{ {