yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 先移除redis优化

Browse Source
This commit is contained in:
liguoyang
2024-02-27 15:25:57 +08:00
parent 6b08cb58a3
commit 82faedcf41
1 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -6,23 +6,22 @@ using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Device.Enums;
using Dlhis.Entity.Sys.Entities; using Dlhis.Entity.Sys.Entities;
using Dlhis.Entity.Sys.Enums; using Dlhis.Entity.Sys.Enums;
using Kurisu.AspNetCore.Utils;
using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto; using Kurisu.Core.DataAccess.Dto;
using Kurisu.Core.User.Abstractions;
using Kurisu.SqlSugar.Services; using Kurisu.SqlSugar.Services;
using Newtonsoft.Json;
namespace Dlhis.Basic.Device.Services.Implements; namespace Dlhis.Basic.Device.Services.Implements;
public class DevicePermissionService : IDevicePermissionService public class DevicePermissionService : IDevicePermissionService
{ {
private readonly IDbContext _dbContext; private readonly IDbContext _dbContext;
private readonly RedisCache _redisCache; private readonly ICurrentUser _currentUser;
public DevicePermissionService(IDbContext dbContext, RedisCache redisCache) public DevicePermissionService(IDbContext dbContext, ICurrentUser currentUser)
{ {
_dbContext = dbContext; _dbContext = dbContext;
_redisCache = redisCache; _currentUser = currentUser;
} }
public async Task AssignAsync(DevicePermissionSaveReuqest reuqest) public async Task AssignAsync(DevicePermissionSaveReuqest reuqest)
@@ -63,42 +62,36 @@ public class DevicePermissionService : IDevicePermissionService
public async Task GenerateDeviceTasksAsync(Func<Task> func, List<string> userNos) public async Task GenerateDeviceTasksAsync(Func<Task> func, List<string> userNos)
{ {
var sw = Stopwatch.StartNew(); //var redisKey = "devicePermissions:" + _currentUser.GetStringTenantId();
//获取当前所有人的权限 //获取当前所有人的权限
if (userNos.IsEmpty()) if (userNos.IsEmpty())
userNos = await GetPermissionUserNosAsync(); userNos = await GetPermissionUserNosAsync();
var beforeDic = new Dictionary<string, List<Guid>>(); var beforeDic = await GetAssignDeviceCodesInternalAsync(userNos); // new Dictionary<string, List<Guid>>();
if (await _redisCache.KeyExistsAsync("devicePermissions")) //if (await _redisCache.KeyExistsAsync(redisKey))
{ //{
var cache = await _redisCache.StringGetAsync<Dictionary<string, List<Guid>>>("devicePermissions"); // var cache = await _redisCache.StringGetAsync<Dictionary<string, List<Guid>>>(redisKey);
if (cache?.Any() == true) // if (cache?.Any() == true)
{ // {
beforeDic = cache; // beforeDic = cache;
} // }
} //}
else //else
{ //{
beforeDic = await GetAssignDeviceCodesInternalAsync(userNos); // beforeDic = await GetAssignDeviceCodesInternalAsync(userNos);
} //}
await Console.Out.WriteLineAsync($"获取当前所有人的权限耗时:{sw.ElapsedMilliseconds}");
sw.Restart();
//业务处理 //业务处理
await func(); await func();
await Console.Out.WriteLineAsync($"业务处理耗时:{sw.ElapsedMilliseconds}");
sw.Restart();
//获取业务处理后所有人的权限 //获取业务处理后所有人的权限
var nextUserNos = await GetPermissionUserNosAsync(); var nextUserNos = await GetPermissionUserNosAsync();
if (nextUserNos.Any()) if (nextUserNos.Any())
userNos = userNos.Concat(nextUserNos).Distinct().ToList(); userNos = userNos.Concat(nextUserNos).Distinct().ToList();
var currentDic = await GetAssignDeviceCodesInternalAsync(userNos); var currentDic = await GetAssignDeviceCodesInternalAsync(userNos);
await Console.Out.WriteLineAsync($"获取业务处理后所有人的权限耗时:{sw.ElapsedMilliseconds}");
sw.Restart();
var deivces = await _dbContext.Queryable<DeviceEntity>().ToListAsync(); var deivces = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
var waitTasks = new List<DeviceTaskEntity>(); var waitTasks = new List<DeviceTaskEntity>();
foreach (var userNo in userNos) foreach (var userNo in userNos)
@@ -145,15 +138,10 @@ public class DevicePermissionService : IDevicePermissionService
waitTasks.AddRange(toDeleted.Concat(toAdd).ToList()); waitTasks.AddRange(toDeleted.Concat(toAdd).ToList());
} }
await Console.Out.WriteLineAsync($"比对任务生成耗时:{sw.ElapsedMilliseconds}");
if (waitTasks.Any()) if (waitTasks.Any())
{ {
sw.Restart(); //await _redisCache.StringSetAsync(redisKey, JsonConvert.SerializeObject(currentDic));
await _redisCache.StringSetAsync("devicePermissions", JsonConvert.SerializeObject(currentDic));
await _dbContext.InsertAsync(waitTasks); await _dbContext.InsertAsync(waitTasks);
await Console.Out.WriteLineAsync($"任务写入耗时:{sw.ElapsedMilliseconds}");
} }
} }