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

test .

Browse Source
This commit is contained in:
liguoyang
2024-12-24 18:55:10 +08:00
parent 81833e88cc
commit 06a5096964
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
View File

@@ -1,4 +1,5 @@
using Dlhis.Basic.Device.Filters; using Dlhis.Basic.Device.Dtos;
using Dlhis.Basic.Device.Filters;
using Dlhis.Basic.Device.Request; using Dlhis.Basic.Device.Request;
using Dlhis.Basic.Device.Response; using Dlhis.Basic.Device.Response;
using Dlhis.Basic.Device.Services; using Dlhis.Basic.Device.Services;
@@ -100,11 +101,18 @@ public class DevicePermissionsController : ControllerBase
{ {
await _devicePermissionService.ResetGainfoPageByDeviceAsync(request.Code); await _devicePermissionService.ResetGainfoPageByDeviceAsync(request.Code);
} }
[HttpGet("userPermissionCodes")] [HttpGet("userPermissionCodes")]
[IgnoreTenant] [IgnoreTenant]
public async Task<List<Guid>> GetAssignDeviceCodesAsync(string userCode) public async Task<List<Guid>> GetAssignDeviceCodesAsync(string userCode)
{ {
return await _devicePermissionService.GetUserDeviceCodesByNoAsync(userCode); return await _devicePermissionService.GetUserDeviceCodesByNoAsync(userCode);
} }
[HttpGet("test-userPermissionCodes")]
public async Task<Dictionary<string, List<TenantAssignTypeDeviceCode>>> GetTestAssignDeviceCodesAsync(string userNo)
{
return await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(new List<string> { userNo });
}
} }

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

@@ -62,7 +62,7 @@ public class DevicePermissionService : IDevicePermissionService
.Where(x => x.TenantId == currentTenantId) .Where(x => x.TenantId == currentTenantId)
.ToListAsync(); .ToListAsync();
var beforeUserNos = dps.Select(x => x.AssignValue).ToList(); var beforeUserNos = dps.Select(x => x.AssignValue).Distinct().ToList();
var presentUserNos = new List<string>(); var presentUserNos = new List<string>();
if (request.Values.IsPresent()) if (request.Values.IsPresent())
@@ -88,7 +88,7 @@ public class DevicePermissionService : IDevicePermissionService
var usersToDelete = beforeUserNos.Except(presentUserNos).ToList(); var usersToDelete = beforeUserNos.Except(presentUserNos).ToList();
var userTenantDeviceCodes = usersToDelete.IsPresent() var userTenantDeviceCodes = usersToDelete.IsPresent()
? await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(beforeUserNos.Union(presentUserNos).ToList()) ? await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(beforeUserNos.Concat(presentUserNos).Distinct().ToList())
: new Dictionary<string, List<TenantAssignTypeDeviceCode>>(); : new Dictionary<string, List<TenantAssignTypeDeviceCode>>();
tasksToAdd.AddRange(usersToAdd.Select(userNo => new DeviceTaskEntity tasksToAdd.AddRange(usersToAdd.Select(userNo => new DeviceTaskEntity