gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎优化字典相关服务（修复后台连续调用报错问题）

Browse Source
This commit is contained in:
zuohuaijun 2025-07-18 11:46:27 +08:00
parent 5275341ba1
commit 92438e9085
2 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs
View File

@ -15,7 +15,6 @@ public class SysDictDataService : IDynamicApiController, ITransient
private readonly SqlSugarRepository<SysDictData> _sysDictDataRep; private readonly SqlSugarRepository<SysDictData> _sysDictDataRep;
private readonly SysCacheService _sysCacheService; private readonly SysCacheService _sysCacheService;
private readonly UserManager _userManager; private readonly UserManager _userManager;
public readonly ISugarQueryable<SysDictData> VSysDictData;
public SysDictDataService(SqlSugarRepository<SysDictData> sysDictDataRep, public SysDictDataService(SqlSugarRepository<SysDictData> sysDictDataRep,
SysCacheService sysCacheService, SysCacheService sysCacheService,
@ -24,9 +23,6 @@ public class SysDictDataService : IDynamicApiController, ITransient
_sysDictDataRep = sysDictDataRep; _sysDictDataRep = sysDictDataRep;
_sysCacheService = sysCacheService; _sysCacheService = sysCacheService;
_userManager = userManager; _userManager = userManager;
VSysDictData = _sysDictDataRep.Context.UnionAll(
_sysDictDataRep.AsQueryable(),
_sysDictDataRep.Change<SysDictDataTenant>().AsQueryable().Select<SysDictData>());
} }
/// <summary> /// <summary>
@ -37,7 +33,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
[DisplayName("获取字典值分页列表")] [DisplayName("获取字典值分页列表")]
public async Task<SqlSugarPagedList<SysDictData>> Page(PageDictDataInput input) public async Task<SqlSugarPagedList<SysDictData>> Page(PageDictDataInput input)
{ {
return await VSysDictData return await _sysDictDataRep.AsQueryable()
.Where(u => u.DictTypeId == input.DictTypeId) .Where(u => u.DictTypeId == input.DictTypeId)
.WhereIF(!string.IsNullOrEmpty(input.Code?.Trim()), u => u.Code.Contains(input.Code)) .WhereIF(!string.IsNullOrEmpty(input.Code?.Trim()), u => u.Code.Contains(input.Code))
.WhereIF(!string.IsNullOrEmpty(input.Label?.Trim()), u => u.Label.Contains(input.Label)) .WhereIF(!string.IsNullOrEmpty(input.Label?.Trim()), u => u.Label.Contains(input.Label))
@ -64,7 +60,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
[DisplayName("增加字典值")] [DisplayName("增加字典值")]
public async Task AddDictData(AddDictDataInput input) public async Task AddDictData(AddDictDataInput input)
{ {
var isExist = await VSysDictData.AnyAsync(u => u.Code == input.Code && u.DictTypeId == input.DictTypeId); var isExist = await _sysDictDataRep.IsAnyAsync(u => u.Code == input.Code && u.DictTypeId == input.DictTypeId);
if (isExist) throw Oops.Oh(ErrorCodeEnum.D3003); if (isExist) throw Oops.Oh(ErrorCodeEnum.D3003);
var dictType = await _sysDictDataRep.Change<SysDictType>().GetByIdAsync(input.DictTypeId); var dictType = await _sysDictDataRep.Change<SysDictType>().GetByIdAsync(input.DictTypeId);
@ -72,7 +68,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
_sysCacheService.Remove($"{CacheConst.KeyDict}{dictType.Code}"); _sysCacheService.Remove($"{CacheConst.KeyDict}{dictType.Code}");
dynamic dictData = dictType.IsTenant == YesNoEnum.Y ? input.Adapt<SysDictDataTenant>() : input.Adapt<SysDictData>(); var dictData = dictType.IsTenant == YesNoEnum.Y ? input.Adapt<SysDictDataTenant>() : input.Adapt<SysDictData>();
await _sysDictDataRep.Context.Insertable(dictData).ExecuteCommandAsync(); await _sysDictDataRep.Context.Insertable(dictData).ExecuteCommandAsync();
} }
@ -86,17 +82,17 @@ public class SysDictDataService : IDynamicApiController, ITransient
[DisplayName("更新字典值")] [DisplayName("更新字典值")]
public async Task UpdateDictData(UpdateDictDataInput input) public async Task UpdateDictData(UpdateDictDataInput input)
{ {
var isExist = await VSysDictData.AnyAsync(u => u.Id == input.Id); var isExist = await _sysDictDataRep.IsAnyAsync(u => u.Id == input.Id);
if (!isExist) throw Oops.Oh(ErrorCodeEnum.D3004); if (!isExist) throw Oops.Oh(ErrorCodeEnum.D3004);
isExist = await VSysDictData.AnyAsync(u => u.Code == input.Code && u.DictTypeId == input.DictTypeId && u.Id != input.Id); isExist = await _sysDictDataRep.IsAnyAsync(u => u.Code == input.Code && u.DictTypeId == input.DictTypeId && u.Id != input.Id);
if (isExist) throw Oops.Oh(ErrorCodeEnum.D3003); if (isExist) throw Oops.Oh(ErrorCodeEnum.D3003);
var dictType = await _sysDictDataRep.Change<SysDictType>().GetByIdAsync(input.DictTypeId); var dictType = await _sysDictDataRep.Change<SysDictType>().GetByIdAsync(input.DictTypeId);
if (dictType.SysFlag == YesNoEnum.Y && !_userManager.SuperAdmin) throw Oops.Oh(ErrorCodeEnum.D3009); if (dictType.SysFlag == YesNoEnum.Y && !_userManager.SuperAdmin) throw Oops.Oh(ErrorCodeEnum.D3009);
_sysCacheService.Remove($"{CacheConst.KeyDict}{dictType.Code}"); _sysCacheService.Remove($"{CacheConst.KeyDict}{dictType.Code}");
dynamic dictData = dictType.IsTenant == YesNoEnum.Y ? input.Adapt<SysDictDataTenant>() : input.Adapt<SysDictData>(); var dictData = dictType.IsTenant == YesNoEnum.Y ? input.Adapt<SysDictDataTenant>() : input.Adapt<SysDictData>();
await _sysDictDataRep.Context.Updateable(dictData).ExecuteCommandAsync(); await _sysDictDataRep.Context.Updateable(dictData).ExecuteCommandAsync();
} }
@ -110,13 +106,13 @@ public class SysDictDataService : IDynamicApiController, ITransient
[DisplayName("删除字典值")] [DisplayName("删除字典值")]
public async Task DeleteDictData(DeleteDictDataInput input) public async Task DeleteDictData(DeleteDictDataInput input)
{ {
var dictData = await VSysDictData.FirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D3004); var dictData = await _sysDictDataRep.GetByIdAsync(input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D3004);
var dictType = await _sysDictDataRep.Change<SysDictType>().GetByIdAsync(dictData.DictTypeId); var dictType = await _sysDictDataRep.Change<SysDictType>().GetByIdAsync(dictData.DictTypeId);
if (dictType.SysFlag == YesNoEnum.Y && !_userManager.SuperAdmin) throw Oops.Oh(ErrorCodeEnum.D3010); if (dictType.SysFlag == YesNoEnum.Y && !_userManager.SuperAdmin) throw Oops.Oh(ErrorCodeEnum.D3010);
_sysCacheService.Remove($"{CacheConst.KeyDict}{dictType.Code}"); _sysCacheService.Remove($"{CacheConst.KeyDict}{dictType.Code}");
dynamic entity = dictType.IsTenant == YesNoEnum.Y ? input.Adapt<SysDictDataTenant>() : input.Adapt<SysDictData>(); var entity = dictType.IsTenant == YesNoEnum.Y ? input.Adapt<SysDictDataTenant>() : input.Adapt<SysDictData>();
await _sysDictDataRep.Context.Deleteable(entity).ExecuteCommandAsync(); await _sysDictDataRep.Context.Deleteable(entity).ExecuteCommandAsync();
} }
@ -128,7 +124,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
[DisplayName("获取字典值详情")] [DisplayName("获取字典值详情")]
public async Task<SysDictData> GetDetail([FromQuery] DictDataInput input) public async Task<SysDictData> GetDetail([FromQuery] DictDataInput input)
{ {
return (await VSysDictData.FirstAsync(u => u.Id == input.Id))?.Adapt<SysDictData>(); return await _sysDictDataRep.GetByIdAsync(input.Id);
} }
/// <summary> /// <summary>
@ -140,7 +136,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
[DisplayName("修改字典值状态")] [DisplayName("修改字典值状态")]
public async Task SetStatus(DictDataInput input) public async Task SetStatus(DictDataInput input)
{ {
var dictData = await VSysDictData.FirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D3004); var dictData = await _sysDictDataRep.GetByIdAsync(input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D3004);
var dictType = await _sysDictDataRep.Change<SysDictType>().GetByIdAsync(dictData.DictTypeId); var dictType = await _sysDictDataRep.Change<SysDictType>().GetByIdAsync(dictData.DictTypeId);
if (dictType.SysFlag == YesNoEnum.Y && !_userManager.SuperAdmin) throw Oops.Oh(ErrorCodeEnum.D3009); if (dictType.SysFlag == YesNoEnum.Y && !_userManager.SuperAdmin) throw Oops.Oh(ErrorCodeEnum.D3009);
@ -148,7 +144,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
_sysCacheService.Remove($"{CacheConst.KeyDict}{dictType.Code}"); _sysCacheService.Remove($"{CacheConst.KeyDict}{dictType.Code}");
dictData.Status = input.Status; dictData.Status = input.Status;
dynamic entity = dictType.IsTenant == YesNoEnum.Y ? input.Adapt<SysDictDataTenant>() : input.Adapt<SysDictData>(); var entity = dictType.IsTenant == YesNoEnum.Y ? input.Adapt<SysDictDataTenant>() : input.Adapt<SysDictData>();
await _sysDictDataRep.Context.Updateable(entity).ExecuteCommandAsync(); await _sysDictDataRep.Context.Updateable(entity).ExecuteCommandAsync();
} }
@ -187,26 +183,42 @@ public class SysDictDataService : IDynamicApiController, ITransient
!string.IsNullOrWhiteSpace(code) && typeId != null) !string.IsNullOrWhiteSpace(code) && typeId != null)
throw Oops.Oh(ErrorCodeEnum.D3011); throw Oops.Oh(ErrorCodeEnum.D3011);
var dictType = await _sysDictDataRep.Change<SysDictType>().AsQueryable() var dictDataList = _sysCacheService.Get<List<SysDictData>>($"{CacheConst.KeyDict}{code}");
.WhereIF(!string.IsNullOrWhiteSpace(code), u => u.Code == code)
.WhereIF(typeId != null, u => u.Id == typeId)
.FirstAsync();
if (dictType == null) return null;
var dictDataList = _sysCacheService.Get<List<SysDictData>>($"{CacheConst.KeyDict}{dictType.Code}");
if (dictDataList == null) if (dictDataList == null)
{ {
dictDataList = await VSysDictData.InnerJoin<SysDictType>((u, a) => u.DictTypeId == a.Id) dictDataList = await _sysDictDataRep.Change<SysDictType>().AsQueryable()
.Where(u => u.DictTypeId == dictType.Id) .LeftJoin<SysDictData>((u, a) => u.Id == a.DictTypeId).ClearFilter()
.Select((u, a) => new SysDictData .WhereIF(!string.IsNullOrWhiteSpace(code), u => u.Code == code)
{ .WhereIF(typeId != null && typeId > 0, u => u.Id == typeId)
Status = u.Status == StatusEnum.Enable && a.Status == StatusEnum.Enable ? StatusEnum.Enable : StatusEnum.Disable, .Where((u, a) => u.Status == StatusEnum.Enable && a.Status == StatusEnum.Enable)
}, true) .OrderBy((u, a) => new { a.OrderNo, a.Code })
.OrderBy(u => new { u.OrderNo, u.Code }) .Select((u, a) => a).ToListAsync();
.ToListAsync(); _sysCacheService.Set($"{CacheConst.KeyDict}{code}", dictDataList);
_sysCacheService.Set($"{CacheConst.KeyDict}{dictType.Code}", dictDataList);
} }
return dictDataList; return dictDataList;
//// 判断字典是否存在
//var dictType = await _sysDictDataRep.Change<SysDictType>().AsQueryable()
// .WhereIF(!string.IsNullOrWhiteSpace(code), u => u.Code == code)
// .WhereIF(typeId != null, u => u.Id == typeId)
// .FirstAsync();
//if (dictType == null) return null;
//var dictDataList = _sysCacheService.Get<List<SysDictData>>($"{CacheConst.KeyDict}{dictType.Code}");
//if (dictDataList == null)
//{
// dictDataList = await _sysDictDataRep.AsQueryable()
// .InnerJoin<SysDictType>((u, a) => u.DictTypeId == a.Id)
// .Where(u => u.DictTypeId == dictType.Id)
// .Select((u, a) => new SysDictData
// {
// Status = u.Status == StatusEnum.Enable && a.Status == StatusEnum.Enable ? StatusEnum.Enable : StatusEnum.Disable,
// }, true)
// .OrderBy(u => new { u.OrderNo, u.Code })
// .ToListAsync();
// _sysCacheService.Set($"{CacheConst.KeyDict}{dictType.Code}", dictDataList);
//}
//return dictDataList;
} }
/// <summary> /// <summary>

2
Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs
View File

@ -163,7 +163,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
public async Task<dynamic> GetAllDictList() public async Task<dynamic> GetAllDictList()
{ {
var ds = await _sysDictTypeRep.AsQueryable() var ds = await _sysDictTypeRep.AsQueryable()
.InnerJoin(_sysDictDataService.VSysDictData, (u, a) => u.Id == a.DictTypeId) .InnerJoin<SysDictData>((u, a) => u.Id == a.DictTypeId).ClearFilter()
.Where((u, a) => u.Status == StatusEnum.Enable && a.Status == StatusEnum.Enable) .Where((u, a) => u.Status == StatusEnum.Enable && a.Status == StatusEnum.Enable)
.Select((u, a) => new { TypeCode = u.Code, a.Label, a.Value, a.Code, a.Remark, a.OrderNo, a.TagType, a.ExtData }) .Select((u, a) => new { TypeCode = u.Code, a.Label, a.Value, a.Code, a.Remark, a.OrderNo, a.TagType, a.ExtData })
.ToListAsync(); .ToListAsync();