fix 优化批量处理逻辑

This commit is contained in:
2025-01-06 10:57:04 +08:00
parent a915492d27
commit a9d284b43c
6 changed files with 28 additions and 56 deletions

View File

@@ -3,7 +3,6 @@ using Dlhis.Basic.Organization.Request;
using Dlhis.Basic.Organization.Response;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Device.Enums;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Kurisu.AspNetCore.Utils.Extensions;
using Mapster;
@@ -14,17 +13,17 @@ public class GainfoCardService : IGainfoCardService
{
private readonly IDbContext _dbContext;
private readonly IGainfoStore _gainfoStore;
private readonly IDevicePermissionService _devicePermissionService;
private readonly IDevicePermissionAnalyzeService _devicePermissionAnalyzeService;
private readonly IGainfoPermissionService _gainfoPermissionService;
public GainfoCardService(IDbContext dbContext,
IGainfoStore gainfoStore,
IDevicePermissionService devicePermissionService,
IDevicePermissionAnalyzeService devicePermissionAnalyzeService,
IGainfoPermissionService gainfoPermissionService)
{
_dbContext = dbContext;
_gainfoStore = gainfoStore;
_devicePermissionService = devicePermissionService;
_devicePermissionAnalyzeService = devicePermissionAnalyzeService;
_gainfoPermissionService = gainfoPermissionService;
}
@@ -57,36 +56,28 @@ public class GainfoCardService : IGainfoCardService
.ToListAsync();
}
public async Task<List<KeyValueDto<string, string>>> GetCardTypesAsync()
public async Task EditCardTypeAsync(List<string> userCodes, int typeId)
{
var r = new List<KeyValueDto<string, string>>
var gainfos = await _dbContext.Queryable<GainfoEntity>().Where(x => userCodes.Contains(x.Code)).ToListAsync();
(gainfos.Count == userCodes.Count).ThrowIfFalse("人员不存在");
var result = await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(gainfos.Select(x => x.No).ToList());
foreach (var gainfo in gainfos)
{
new()
{
Key = "行政卡", Value = "2"
},
new()
{
Key = "车间卡", Value = "3"
}
};
var userNo = gainfo.No;
var myDeviceCodes = result[userNo].SelectMany(x => x.AssignTypes.SelectMany(p => p.Codes)).Distinct().ToList();
return await Task.FromResult(r);
}
var deviceCodes = await _dbContext.Queryable<DeviceEntity>()
.Where(x => myDeviceCodes.Contains(x.Code))
.Where(x => x.EnableTimePeriod)
.Select(x => x.Code)
.ToListAsync();
public async Task EditCardTypeAsync(string code, int typeId)
{
var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == code).SingleAsync();
gainfo.ThrowIfNull("人员不存在");
gainfo.CardType = typeId;
await _gainfoPermissionService.ResetPermissionsAsync(userNo, DeviceTaskEnumType.Update, deviceCodes, "卡类型编辑下发");
gainfo.CardType = typeId;
}
var myDeviceCodes = await _devicePermissionService.GetUserDeviceCodesByNoAsync(gainfo.No);
var deviceCodes = await _dbContext.Queryable<DeviceEntity>()
.Where(x => myDeviceCodes.Contains(x.Code))
.Where(x => x.EnableTimePeriod)
.Select(x => x.Code)
.ToListAsync();
await _gainfoPermissionService.ResetPermissionsAsync(gainfo.No, DeviceTaskEnumType.Update, deviceCodes, "卡类型编辑下发");
await _dbContext.UpdateAsync(gainfos);
}
}