diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs index 89874b8b..cc43cffe 100644 --- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs +++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs @@ -49,16 +49,6 @@ public class DevicePermissionsController : ControllerBase await _devicePermissionService.AssignToUniqueAsync(request); } - [AllowAnonymous] - [HttpPost("assignment-generate")] - [Transactional] - [IgnoreTenant] - public async Task GeneratePermissionsAsync(GeneratePermissionIdRequest request) - { - await _devicePermissionService.GeneratePermissionsAsync(request.Id); - } - - /// /// 当前类型的权限分配 /// diff --git a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs index 2b63bb2c..e187df3f 100644 --- a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs @@ -23,8 +23,6 @@ public interface IDevicePermissionService : IScopeDependency /// Task AssignToUniqueAsync(DevicePermissionsAssignToDeviceRequest request); - Task GeneratePermissionsAsync(long id); - /// /// 获取分配的权限 /// diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index de19423b..849fe9a5 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -130,51 +130,6 @@ public class DevicePermissionService : IDevicePermissionService }, null); } - public async Task GeneratePermissionsAsync(long id) - { - var assignment = await _dbContext.Queryable().SingleAsync(x => x.Id == id); - if (assignment == null) return; - if (assignment.IsHandler) return; - - try - { - var request = assignment.Assignment.ToObject(); - - await GenerateDeviceTasksAsync(async () => - { - //删除当前匹配的基地权限 - var p = await _dbContext.Queryable() - .Where(x => x.AssignType == request.AssignType) - .Where(x => x.AssignValue == request.AssignValue) - .Where(x => x.UniqueType == request.UniqueType) - .Where(x => x.TenantId == request.TenantId) - .ToListAsync(); - - await _dbContext.DeleteReallyAsync(p); - - //保存配置的权限 - if (request.Codes.IsPresent()) - { - var devicePermissions = request.Codes.Select(code => new DevicePermissionEntity - { - AssignType = request.AssignType, - AssignValue = request.AssignValue, - UniqueType = request.UniqueType, - UniqueValue = code, - TenantId = request.TenantId - }).ToList(); - - await _dbContext.InsertAsync(devicePermissions); - } - }, null); - } - finally - { - assignment.IsHandler = true; - await _dbContext.UpdateAsync(assignment); - } - } - public async Task> GetAssignmentsAsync(DeviceGetAssignmentsRequest request) { return await _dbContext.Queryable() diff --git a/Src/Dlhis.Entity/Basic/Entity/DevicePermissionEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DevicePermissionEntity.cs deleted file mode 100644 index 7403ff02..00000000 --- a/Src/Dlhis.Entity/Basic/Entity/DevicePermissionEntity.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Kurisu.AspNetCore.DataAccess.Entity; -using Kurisu.AspNetCore.DataAccess.SqlSugar; -using SqlSugar; - -namespace Dlhis.Entity.Basic.Entity; - -/// -/// 设备权限分配 -/// -[SugarTable(TableName = "DevicePermissionAssignment", TableDescription = "设备权限分配")] -public class DevicePermissionAssignmentEntity : SugarBaseEntity, ITenantId -{ - /// - /// 分配json - /// - [SugarColumn(IsNullable = false, ColumnDataType = "varchar(1000)", ColumnDescription = "分配json")] - public string Assignment { get; set; } - - /// - /// 是否处理 - /// - [SugarColumn(ColumnDataType = "bit(1)", ColumnDescription = "是否处理")] - public bool IsHandler { get; set; } - - /// - /// 处理结果 - /// - [SugarColumn(ColumnDescription = "处理结果")] - public string Result { get; set; } - - public string TenantId { get; set; } -} \ No newline at end of file