fix 代码优化

Src/Dlhis.Basic.Api/IDishesMenuApi.cs

@@ -5,7 +5,7 @@ using Kurisu.RemoteCall.Attributes;
 namespace Dlhis.Basic.Api;
 
 [EnableRemoteClient(Name = "basic-service", BaseUrl = "${InternalRequest:BasicRequestUrl}")]
-public interface IDisheMenuApi
+public interface IDishesMenuApi
 {
     /// <summary>
     /// 

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

@@ -45,17 +45,6 @@ public class DevicePermissionsController : ControllerBase
         return await _devicePermissionService.GetAssignmentsAsync(request.UniqueType, request.AssignType, request.AssignValue);
     }
 
-    /// <summary>
-    /// 获取用户权限设备
-    /// </summary>
-    /// <param name="request"></param>
-    /// <returns></returns>
-    [HttpGet("assignmentsbyno")]
-    public async Task<Pagination<AssigmentByCodeResponse>> GetAssigmentByCodeAsync([FromQuery] AssigmentByCodeRequest request)
-    {
-        return await _devicePermissionService.GetAssigmentByCodeAsync(request);
-    }
-
 
     /// <summary>
     /// 获取就餐设备唯一号权限

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

@@ -1,15 +0,0 @@
-using Kurisu.Core.DataAccess.Dto;
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
-
-namespace Dlhis.Basic.Device.Request
-{
-    public class AssigmentByCodeRequest : PageDto
-    {
-        /// <summary>
-        /// 档案号
-        /// </summary>
-        [Required]
-        public string No { get; set; }
-    }
-}

Src/Dlhis.Basic/Device/Response/AssigmentByCodeResponse.cs

@@ -1,17 +0,0 @@
-using SqlSugar;
-
-namespace Dlhis.Basic.Device.Response
-{
-    public class AssigmentByCodeResponse
-    {
-        /// <summary>
-        /// 设备唯一码,IP/MAC/SNO
-        /// </summary>
-        public string UniqueNo { get; set; }
-
-        /// <summary>
-        /// 设备名称
-        /// </summary>
-        public string UniqueName { get; set; }
-    }
-}

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

@@ -43,7 +43,6 @@ public interface IDevicePermissionService : IScopeDependency
     /// <returns></returns>
     Task GenerateDeviceTasksAsync(string userNo, DeviceTaskEnumType taskType);
     
-
     /// <summary>
     /// 获取用户所有设备权限
     /// </summary>
@@ -59,14 +58,6 @@ public interface IDevicePermissionService : IScopeDependency
     /// <returns></returns>
     Task<List<string>> GetCanteenDeviceUniqueNosByUserNoAsync(string userNo);
 
-    /// <summary>
-    /// 获取用户权限设备
-    /// </summary>
-    /// <param name="request"></param>
-    /// <returns></returns>
-    Task<Pagination<AssigmentByCodeResponse>> GetAssigmentByCodeAsync(AssigmentByCodeRequest request);
-
-
 
     Task<PermissionUsersInfoDto> GetPermissionUsersInfoAsync(List<string> userNos);
 

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

@@ -318,79 +318,6 @@ public class DevicePermissionService : IDevicePermissionService
         return result.SelectMany(x => x.Codes).ToList();
     }
 
-
-    /// <summary>
-    /// 获取用户权限设备
-    /// </summary>
-    /// <param name="request"></param>
-    /// <returns></returns>
-    public async Task<Pagination<AssigmentByCodeResponse>> GetAssigmentByCodeAsync(AssigmentByCodeRequest request)
-    {
-        var lst1 = new List<Guid>();
-        //所有设备guid
-        var gds = await GetAssignmentsAsync(DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.User, request.No);
-        if (gds != null && gds.Count > 0)
-        {
-            lst1.AddRange(gds);
-        }
-
-        //所有设备组guid
-        var ggs = await GetAssignmentsAsync(DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.User, request.No);
-
-        //所有营业点guid
-        var gps = await GetAssignmentsAsync(DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.User, request.No);
-
-        var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Enable).ToListAsync();
-        var regiss = await _dbContext.Queryable<DeviceRegistryEntity>().ToListAsync();
-
-        if (ggs != null && ggs.Count > 0)
-        {
-            foreach (var gid in ggs)
-            {
-                var ds = await _dbContext.Queryable<DeviceGroupRelationshipEntity>()
-                     .Where(x => x.GroupCode == gid)
-                     .Select(x => x.DeviceCode)
-                     .ToListAsync();
-                lst1.AddRange(ds);
-            }
-        }
-        if (gps != null && gps.Count > 0)
-        {
-            foreach (var placeCode in gps)
-            {
-                var nos = regiss.Where(x => x.BusinessPlaceCode == placeCode)
-                    .Select(x => x.DeviceUniqueNo).ToList();
-
-                var dcodes = devices.Where(d => nos.Contains(d.UniqueNo))
-                    .Select(d => d.Code).ToList();
-                lst1.AddRange(dcodes);
-            }
-        }
-
-        var dds = lst1.Distinct().ToList();
-        var lst = devices.Where(x => dds.Contains(x.Code))
-            .Select(x => new AssigmentByCodeResponse
-            {
-                UniqueNo = x.UniqueNo,
-                UniqueName = x.Supplier
-            }).ToList();
-
-        // 分页操作
-        var startIndex = (request.PageIndex - 1) * request.PageSize;
-        var pagedData = lst.Skip(startIndex).Take(request.PageSize).ToList();
-
-        var pagination = new Pagination<AssigmentByCodeResponse>
-        {
-            PageIndex = request.PageIndex,
-            PageSize = request.PageSize,
-            Total = lst.Count, // 使用原始列表的总数进行分页
-            Data = pagedData
-        };
-
-        return pagination;
-
-    }
-
     //************************************************ help methods *******************************************************
 
     /// <summary>
@@ -440,7 +367,7 @@ public class DevicePermissionService : IDevicePermissionService
             var tops = deviceGroups.Where(x => !x.PCode.HasValue).ToList();
             tops.ForEach(x =>
             {
-                RecursionGetNext(x, deviceGroups, tenantDevicePermissions, tenantDevicePermissions.SelectMany(x => x.Codes).Contains(x.Code));
+                RecursionGetNext(x, deviceGroups, tenantDevicePermissions, tenantDevicePermissions.SelectMany(item => item.Codes).Contains(x.Code));
             });
         }
 
@@ -471,8 +398,8 @@ public class DevicePermissionService : IDevicePermissionService
 
     private async Task<Dictionary<string, List<UserTenantDeviceCodeDto>>> GetAssignDeviceCodesInternalAsync(List<string> userNos)
     {
-        var deivces = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Enable).ToListAsync();
+        var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Enable).ToListAsync();
-        var deviceUniqueNos = deivces.Select(x => x.UniqueNo).ToList();
+        var deviceUniqueNos = devices.Select(x => x.UniqueNo).ToList();
         var registries = await _dbContext.Queryable<DeviceRegistryEntity>()
             .Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo))
             .Where(x => !SqlFunc.IsNullOrEmpty(x.BusinessPlaceCode))
@@ -493,7 +420,7 @@ public class DevicePermissionService : IDevicePermissionService
 
         foreach (var gainfo in gainfos)
         {
-            var codes = GetAssignDeviceCodesInternal(gainfo, gainfoGroupRelationships, devicePermissions, deviceGroups, deviceRelationships, registries, deivces);
+            var codes = GetAssignDeviceCodesInternal(gainfo, gainfoGroupRelationships, devicePermissions, deviceGroups, deviceRelationships, registries, devices);
             result.Add(gainfo.No, codes);
         }
 
@@ -558,14 +485,14 @@ public class DevicePermissionService : IDevicePermissionService
         var deviceGroupCodes = deviceGroupDtos.SelectMany(x => x.Codes).Distinct().ToList();
         var businessPlaceCodes = businessPlaceDtos.SelectMany(x => x.Codes).Distinct().ToList();
 
-        var deveiceCodesByGroup = deviceGroupRelationships.Where(x => deviceGroupCodes.Contains(x.GroupCode)).GroupBy(x => x.TenantId)
+        var deviceCodesByGroup = deviceGroupRelationships.Where(x => deviceGroupCodes.Contains(x.GroupCode)).GroupBy(x => x.TenantId)
             .Select(x => new UserTenantDeviceCodeDto
             {
                 Tenant = x.Key,
                 Codes = x.Select(item => item.DeviceCode).Distinct().ToList()
             });
 
-        var placeGroup = deviceRegistries.Where(x => businessPlaceCodes.Contains(x.BusinessPlaceCode.Value)).GroupBy(x => x.TenantId)
+        var placeGroup = deviceRegistries.Where(x => businessPlaceCodes.Contains(x.BusinessPlaceCode!.Value)).GroupBy(x => x.TenantId)
              .Select(x =>
              {
                  var currentDeviceUniqueNos = x.Select(item => item.DeviceUniqueNo).ToList();
@@ -578,7 +505,7 @@ public class DevicePermissionService : IDevicePermissionService
              })
              .ToList();
 
-        deviceDtos.AddRange(deveiceCodesByGroup);
+        deviceDtos.AddRange(deviceCodesByGroup);
         deviceDtos.AddRange(placeGroup);
 
         return deviceDtos.GroupBy(x => x.Tenant).Select(x => new UserTenantDeviceCodeDto

Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs

@@ -19,16 +19,16 @@ namespace Dlhis.Canteen.Order.Services.Implements;
 
 public class BookingOrderService : BaseOrderService, IBookingOrderService
 {
-    private readonly IDisheMenuApi _disheMenuApi;
+    private readonly IDishesMenuApi _dishesMenuApi;
     private readonly IBusinessPlacePermissionsApi _businessPlacePermissionsApi;
 
     public BookingOrderService(ICanteenSettingService canteenSettingService, IDbContext dbContext,
-        IDisheMenuApi disheMenuApi,
+        IDishesMenuApi dishesMenuApi,
         IBusinessPlacePermissionsApi businessPlacePermissionsApi,
         ICurrentUser currentUser, IDevicePermissionApi devicePermissionApi, ILogger<BookingOrderService> logger)
         : base(canteenSettingService, dbContext, currentUser, devicePermissionApi, logger)
     {
-        _disheMenuApi = disheMenuApi;
+        _dishesMenuApi = dishesMenuApi;
         _businessPlacePermissionsApi = businessPlacePermissionsApi;
     }
 
@@ -46,7 +46,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
         (now >= dealLine).ThrowIfTrue("超出订餐时间");
 
         //菜单存在
-        var menuDetailResult = await _disheMenuApi.GetBookingDishesDetailAsync(request.BookingDate, request.BusinessPlaceCode, (int)request.ShiftType, request.DishesCode);
+        var menuDetailResult = await _dishesMenuApi.GetBookingDishesDetailAsync(request.BookingDate, request.BusinessPlaceCode, (int)request.ShiftType, request.DishesCode);
         var menuDetail = menuDetailResult.Data;
         menuDetail.ThrowIfNull("预定失败,菜品已经下架");
 
@@ -89,8 +89,8 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
         var orderId = await DbContext.InsertReturnIdentityAsync(order);
         await CommonHelper.RetryAsync(async () =>
         {
-            await _disheMenuApi.GetBookingDishesDetailAsync(request.BookingDate, request.BusinessPlaceCode, (int)request.ShiftType, request.DishesCode);
+            await _dishesMenuApi.GetBookingDishesDetailAsync(request.BookingDate, request.BusinessPlaceCode, (int)request.ShiftType, request.DishesCode);
-            var menuDetail = menuDetailResult.Data;
+            menuDetail = menuDetailResult.Data;
             menuDetail.ThrowIfNull("预定失败,菜品已经下架");
             menuDetail.Number -= request.Number;
 
@@ -140,7 +140,6 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
                 Number = request.Number,
                 TenantId = order.TenantId,
             });
-
         }, 10);
 
 
@@ -193,12 +192,11 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
         var details = await DbContext.Queryable<CanteenOrderDetailEntity>()
             .LeftJoin<DishesEntity>((x, dishes) => x.DishesCode == dishes.CustomCode)
             .Where(x => nos.Contains(x.OrderNo))
-            .Select((x, dishes) => new { x.OrderNo, x.BookingDate, x.Number, dishes.Name }).
+            .Select((x, dishes) => new { x.OrderNo, x.BookingDate, x.Number, dishes.Name }).ToListAsync();
-            ToListAsync();
 
         page.Data.ForEach(x =>
         {
-            x.BookingDate = details.FirstOrDefault(item => item.OrderNo == x.No).BookingDate;
+            x.BookingDate = details.First(item => item.OrderNo == x.No).BookingDate;
             x.TotalNumber = details.Where(item => item.OrderNo == x.No).Sum(item => item.Number);
             x.DishesInfos = details.Where(item => item.OrderNo == x.No).Select(item => new
                 {
@@ -243,7 +241,6 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
             .Where(x => x.No == request.No)
             .ExecuteCommandAsync();
 
-        var balance = await DbContext.Queryable<BalanceRecordEntity>().Where(x => x.No == request.No).SingleAsync();
         await DbContext.Updateable<BalanceRecordEntity>()
             .SetColumns(x => x.Status == BalanceRecordStatusEnumType.Obsolute)
             .SetColumns(x => x.Remark == request.Reason)
@@ -265,7 +262,6 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
                     .SetColumns(x => x.ModifiedBy == userId)
                     .Where(x => x.Id == mealInfo.Id && x.Version == mealInfo.Version)
                     .ExecuteCommandThrowVersionAsync();
-
             }, 5);
         }
     }