g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-23 03:50:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复事务锁异常导致sqlite lock

Browse Source
This commit is contained in:
Kimdiego2098
2024-01-25 11:03:39 +08:00
parent 2c6d2e0eb4
commit 56c6ebe523
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ThingsGateway.Admin.Application/EventSubscriber/NoticeEventSubsciber.cs
View File

@@ -43,7 +43,7 @@ public class NoticeEventSubsciber : IEventSubscriber, ISingleton
//客户端ID列表
var clientIds = new List<string>();
//遍历verificat列表获取客户端ID列表
loginEvent.VerificatInfos.ForEach(it =>
loginEvent?.VerificatInfos?.ForEach(it =>
{
clientIds.AddRange(it.ClientIds);
});

8
src/ThingsGateway.Admin.Application/Services/System/Relation/RelationService.cs
View File

@@ -19,13 +19,11 @@ public class Relationservice : DbRepository<SysRelation>, IRelationService
{
private readonly ILogger<Relationservice> _logger;
private readonly ISimpleCacheService _simpleCacheService;
private readonly IResourceService _resourceService;
public Relationservice(ILogger<Relationservice> logger, ISimpleCacheService simpleCacheService, IResourceService resourceService)
public Relationservice(ILogger<Relationservice> logger, ISimpleCacheService simpleCacheService)
{
_logger = logger;
_simpleCacheService = simpleCacheService;
_resourceService = resourceService;
}
/// <inheritdoc/>
@@ -119,7 +117,7 @@ public class Relationservice : DbRepository<SysRelation>, IRelationService
});
}
//事务
var result = await NewContent.UseTranAsync(async () =>
var result = await Context.AsTenant().UseTranAsync(async () =>
{
if (clear)
await DeleteAsync(it => it.ObjectId == objectId && it.Category == category);//删除老的
@@ -147,7 +145,7 @@ public class Relationservice : DbRepository<SysRelation>, IRelationService
ExtJson = extJson
};
//事务
var result = await NewContent.UseTranAsync(async () =>
var result = await Context.AsTenant().UseTranAsync(async () =>
{
if (clear)
await DeleteAsync(it => it.ObjectId == objectId && it.Category == category);//删除老的

4
src/ThingsGateway.Admin.Application/Services/System/Resource/Button/ButtonService.cs
View File

@@ -111,7 +111,7 @@ public class ButtonService : DbRepository<SysResource>, IButtonService
await CheckInput(input);//检查参数
var sysResource = input.Adapt<SysResource>();//实体转换
//事务
var result = await NewContent.UseTranAsync(async () =>
var result = await Context.AsTenant().UseTranAsync(async () =>
{
await UpdateAsync(sysResource);//更新按钮
});
@@ -164,7 +164,7 @@ public class ButtonService : DbRepository<SysResource>, IButtonService
#endregion 处理关系表角色资源信息
//事务
var result = await NewContent.UseTranAsync(async () =>
var result = await Context.AsTenant().UseTranAsync(async () =>
{
await DeleteByIdsAsync(ids.Cast<object>().ToArray());//删除按钮
if (relationList.Count > 0)

2
src/ThingsGateway.Admin.Application/Services/System/Resource/Menu/MenuService.cs
View File

@@ -116,7 +116,7 @@ public class MenuService : DbRepository<SysResource>, IMenuService
});
ids.AddRange(resourceIds);//添加到删除ID列表
//事务
var result = await NewContent.UseTranAsync(async () =>
var result = await Context.AsTenant().UseTranAsync(async () =>
{
await DeleteByIdsAsync(ids.Cast<object>().ToArray());//删除菜单和按钮
await Context.Deleteable<SysRelation>()//关系表删除对应SYS_ROLE_HAS_RESOURCE

2
src/ThingsGateway.Admin.Application/Services/System/Role/RoleService.cs
View File

@@ -113,7 +113,7 @@ public class RoleService : DbRepository<SysRole>, IRoleService
{
var sysRole = input.Adapt<SysRole>();//实体转换
//事务
var result = await NewContent.UseTranAsync(async () =>
var result = await Context.AsTenant().UseTranAsync(async () =>
{
await UpdateAsync(sysRole);//更新角色
});