fix 处理已知问题

Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs

@@ -44,7 +44,7 @@ public class DevicesConnectController : ControllerBase
     /// <returns></returns>
     [HttpPost("register")]
     [IgnoreTenant]
-    public async Task<string> RegisterAsync(DeviceResigterRequest request)
+    public async Task<string> RegisterAsync(DeviceRegisterRequest request)
     {
         return await _deviceConnectService.RegisterAsync(request);
     }

Src/Dlhis.Basic/Device/Controllers/DevicesController.cs

@@ -75,7 +75,7 @@ public class DevicesController : ControllerBase
     [Obsolete("迁移到DeviceConnect")]
     [HttpPost("resigter")]
     [IgnoreTenant]
-    public async Task<string> RegisterAsync(DeviceResigterRequest request)
+    public async Task<string> RegisterAsync(DeviceRegisterRequest request)
     {
         return await _deviceConnectService.RegisterAsync(request);
     }

Src/Dlhis.Basic/Device/Request/DeviceRegisterRequest.cs

@@ -2,7 +2,7 @@
 
 namespace Dlhis.Basic.Device.Request;
 
-public class DeviceResigterRequest
+public class DeviceRegisterRequest
 {
     /// <summary>
     /// 唯一编码

Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs

@@ -11,7 +11,7 @@ public interface IDeviceConnectService : IScopeDependency
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    Task<string> RegisterAsync(DeviceResigterRequest request);
+    Task<string> RegisterAsync(DeviceRegisterRequest request);
 
 
     /// <summary>

Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs

@@ -24,7 +24,7 @@ public class DeviceConnectService : IDeviceConnectService
     }
 
 
-    public async Task<string> RegisterAsync(DeviceResigterRequest request)
+    public async Task<string> RegisterAsync(DeviceRegisterRequest request)
     {
         var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == request.BusinessCustomCode).SingleAsync();
         businessPlace.ThrowIfNull("营业点不存在");
@@ -195,6 +195,14 @@ public class DeviceConnectService : IDeviceConnectService
 
                 await _dbContext.InsertAsync(device);
             }
+            else
+            {
+                if (tenantId.IsPresent())
+                {
+                    device.TenantId = tenantId;
+                    await _dbContext.UpdateAsync(device);
+                }
+            }
         }
 
         return device;

Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs

@@ -89,7 +89,7 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService
         DeviceAssignmentTypeEnumType? ignoreUniqueType = null,
         string ignoreAssignValue = null, AssignTypeEnumType? ignoreAssignType = null)
     {
-        var gainfos = await _dbContext.Queryable<GainfoEntity>().Where(x => userNos.Contains(x.No)).ToListAsync();
+        var gainfos = await _dbContext.Queryable<GainfoEntity>().WhereIF(userNos.IsPresent(), x => userNos.Contains(x.No)).ToListAsync();
         if (!gainfos.Any()) return new Dictionary<string, List<TenantAssignTypeDeviceCode>>();
 
         var devices = await _dbContext.Queryable<DeviceEntity>().ToListAsync();

Src/Dlhis.Basic/Organization/Controllers/GainfoPermissionsController.cs

@@ -2,7 +2,6 @@
 using Dlhis.Basic.Organization.Request;
 using Dlhis.Basic.Organization.Response;
 using Dlhis.Basic.Organization.Services;
-using Dlhis.Basic.Places.Response;
 using Dlhis.Entity.Device.Enums;
 using Kurisu.AspNetCore.DataAccess.Dto;
 using Microsoft.AspNetCore.Authorization;
@@ -17,7 +16,6 @@ public class GainfoPermissionsController : ControllerBase
 {
     private readonly IGainfoPermissionService _gainfoPermissions;
 
-
     public GainfoPermissionsController(IGainfoPermissionService gainfoPermissions)
     {
         _gainfoPermissions = gainfoPermissions;

Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissionService.cs

@@ -80,7 +80,10 @@ public class GainfoPermissionService : IGainfoPermissionService
     public async Task<Pagination<GainfoDevicePermissionResponse>> GetAssignDeviceCodesAsync(DeviceAssRequest request)
     {
         var result = await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(new List<string> { request.UserNo });
-        var permissions = result[request.UserNo].ToList();
+        if (!result.TryGetValue(request.UserNo, out var permissions))
+        {
+            return new Pagination<GainfoDevicePermissionResponse>();
+        }
 
         var codes = permissions.SelectMany(x => x.AssignTypes.SelectMany(p => p.Codes)).Distinct().ToList();
 
@@ -144,6 +147,73 @@ public class GainfoPermissionService : IGainfoPermissionService
 
         return page;
     }
+    //
+    // public async Task<Pagination<GainfoDevicePermissionResponse>> GetAllUserAssignDeviceCodesAsync()
+    // {
+    //     var result = await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(null);
+    //
+    //     var codes = permissions.SelectMany(x => x.AssignTypes.SelectMany(p => p.Codes)).Distinct().ToList();
+    //
+    //     var page = await _dbContext.Queryable<DeviceEntity>()
+    //         .LeftJoin<DeviceRegistryEntity>((d, dr) => d.UniqueNo == dr.DeviceUniqueNo)
+    //         .WhereIF(request.DeviceType.HasValue, d => d.Type == request.DeviceType)
+    //         .WhereIF(request.Search.IsPresent(), d => d.UniqueNo == request.Search)
+    //         .Where(d => codes.Contains(d.Code))
+    //         .Select((d, dr) => new GainfoDevicePermissionResponse { Factory = d.TenantId }, true)
+    //         .ToPageListAsync(request);
+    //
+    //     var deviceGroups = await _dbContext.Queryable<DeviceGroupEntity>().Select(x => new { x.Code, x.Name }).ToListAsync();
+    //     var departments = permissions.Any(x => x.AssignTypes.Any(p => p.AssignType == AssignTypeEnumType.Department))
+    //         ? await _dbContext.Queryable<DepartmentEntity>().Select(x => new { x.No, x.Name }).ToListAsync()
+    //         : new[] { new { No = string.Empty, Name = string.Empty } }.ToList();
+    //
+    //     var userGroups = permissions.Any(x => x.AssignTypes.Any(p => p.AssignType == AssignTypeEnumType.Group))
+    //         ? await _dbContext.Queryable<GainfoGroupEntity>().Select(x => new { x.Code, x.Name }).ToListAsync()
+    //         : new[] { new { Code = Guid.Empty, Name = string.Empty } }.ToList();
+    //
+    //     page.Data.ForEach(item =>
+    //     {
+    //         var permission = permissions.FirstOrDefault(x => x.Tenant == item.Factory);
+    //         if (permission != null)
+    //         {
+    //             item.Source = new DevicePermissionSourceDto
+    //             {
+    //                 Factory = item.Factory,
+    //                 Types = permission.AssignTypes.Where(x => x.Codes.Any(p => p == item.Code)).Select(x =>
+    //                 {
+    //                     var codeDesc = x.UniqueType == DeviceAssignmentTypeEnumType.Device
+    //                         ? item.DeployPlace
+    //                         : deviceGroups.FirstOrDefault(p => p.Code == x.OriginalCodes.First())?.Name;
+    //
+    //                     var currentAssignValue = x.AssignValue;
+    //
+    //                     currentAssignValue = x.AssignType switch
+    //                     {
+    //                         AssignTypeEnumType.Department => departments.FirstOrDefault(p => p.No == x.AssignValue.Split(":")[1])?.Name,
+    //                         AssignTypeEnumType.Group => userGroups.FirstOrDefault(p => p.Code == Guid.Parse(currentAssignValue))?.Name,
+    //                         AssignTypeEnumType.User => "自己",
+    //                         _ => currentAssignValue
+    //                     };
+    //
+    //                     var r = new DevicePermissionSourceTypeDto
+    //                     {
+    //                         AssignType = x.AssignType,
+    //                         AssignValue = currentAssignValue,
+    //                         UniqueType = x.UniqueType,
+    //                         Codes = x.UniqueType == DeviceAssignmentTypeEnumType.Device
+    //                             ? x.Codes.Where(p => p == item.Code)
+    //                             : x.Codes.Take(1),
+    //                         CodeDesc = codeDesc
+    //                     };
+    //
+    //                     return r;
+    //                 })
+    //             };
+    //         }
+    //     });
+    //
+    //     return page;
+    // }
 
 
     public async Task<DevicePermissionAssignResponse> ResetPermissionsAsync(string userNo, DeviceTaskEnumType type, List<Guid> deviceCodes, string source)