fix 优化查询null值,注释

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

@@ -32,6 +32,12 @@ public class DeviceSaveRequest
     [Required(ErrorMessage = "设备功能不能为空")]
     public List<DeviceFuncEnumType> Funcs { get; set; }
 
+    /// <summary>
+    /// 心跳间隔
+    /// </summary>
+    [Range(0, int.MaxValue)]
+    public int HeartbeatInterval { get; set; }
+
     /// <summary>
     /// 部署点
     /// </summary>

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

@@ -27,9 +27,11 @@ public class DeviceService : IDeviceService
     public async Task<Pagination<DevicePageResponse>> GetPageAsync(DevicePageRequest request)
     {
         var page = await _dbContext.Queryable<DeviceEntity>()
-               .Select(device => new DevicePageResponse
+               .LeftJoin<DeviceTemplateEntity>((d, dt) => d.TemplateCode == dt.Code)
+               .Select((d, dt) => new DevicePageResponse
                {
-                   FuncsStr = device.Funcs.ToString()
+                   FuncsStr = d.Funcs.ToString(),
+                   Brand = dt.Brand,
 
                }, true)
                .ToPageListAsync(request);
@@ -70,7 +72,8 @@ public class DeviceService : IDeviceService
             var entity = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Id == request.Id).FirstAsync();
             entity.ThrowIfNull("设备不存在,无法更新");
 
-            request.Adapt(entity);
+            var uniqueNo = entity.UniqueNo;
+            request.Adapt(entity).UniqueNo = uniqueNo;
 
             await _dbContext.UpdateAsync(entity);
         }

Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs

@@ -24,7 +24,16 @@ public class MealUserService : IMealUserService
     public async Task<Pagination<MealUserResponse>> GetPageAsync(MealUserPageRequest request)
     {
         var page = await _dbContext.Queryable<CanteenUserEntity>()
-              .Select<MealUserResponse>()
+            .LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
+              .Select((x, ga) => new MealUserResponse
+              {
+                  Balance = x.Balance,
+                  BalanceOfRecharge = x.BalanceOfRecharge,
+                  BalanceOfSubsidies = x.BalanceOfSubsidies,
+                  UserCode = ga.Code,
+                  UserNo = ga.No,
+                  UserType = x.UserType
+              })
               .ToPageListAsync(request);
 
         return page;

Src/Dlhis.Canteen/Setting/Request/CanteenSettingSaveRequest.cs

@@ -8,31 +8,31 @@ public class CanteenSettingSaveRequest
     public long? Id { get; set; }
 
     /// <summary>
-    /// 配置生效范围
+    /// 配置生效范围类型 CanteenSettingUnqiueEnumType
     /// </summary>
     [EnumDataType(typeof(CanteenSettingUnqiueEnumType))]
     public CanteenSettingUnqiueEnumType UniqueType { get; set; }
 
     /// <summary>
-    /// 唯一值 eg:UniqueType = 1时,传入非空字符串
+    /// 配置生效范围
     /// </summary>
-    [Required(ErrorMessage = "值不能为空")]
+    [Required(ErrorMessage = "配置生效范围不能为空")]
     public string UniqueValue { get; set; }
 
     /// <summary>
-    /// 自定义分类分类
+    /// 自定义分类
     /// </summary>
     [Required(ErrorMessage = "分类不能为空")]
     public string Catalog { get; set; }
 
     /// <summary>
-    /// 参数 CanteenSettingItemEnumType
+    /// 就餐配置 CanteenSettingItemEnumType
     /// </summary>
     [EnumDataType(typeof(CanteenSettingItemEnumType))]
     public CanteenSettingItemEnumType Item { get; set; }
 
     /// <summary>
-    /// 值
+    /// 参数值
     /// </summary>
     public string Value { get; set; }
 }

Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs

@@ -42,9 +42,9 @@ public class GainfoEntity : SugarBaseEntity
     public string NameEn { get; set; }
 
     /// <summary>
-    /// 工号
+    /// 学工号
     /// </summary>
-    [SugarColumn(ColumnDescription = "工号")]
+    [SugarColumn(ColumnDescription = "学工号")]
     public string Code { get; set; }
 
     /// <summary>

Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateGetAttendanceJob.cs

@@ -2,10 +2,11 @@
 using Dlhis.Entity.Device.Entities;
 using Dlhis.Entity.Device.Enums;
 using Kurisu.AspNetCore.Utils.Extensions;
+using Kurisu.Core.DataAccess.Entity;
 using Kurisu.SqlSugar.Services;
 
-namespace Dlhis.ScheduledTask.TaskAssignment.Job
-{
+namespace Dlhis.ScheduledTask.TaskAssignment.Job;
+
 public class CreateGetAttendanceJob
 {
     private readonly IDbContext _dbContext;
@@ -19,7 +20,7 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Job
 
     public async Task RunAsync()
     {
-            _dbContext.Client.QueryFilter.ClearAndBackup();
+        _dbContext.Client.QueryFilter.ClearAndBackup<ITenantId>();
         try
         {
             var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Enable).ToListAsync();
@@ -47,7 +48,7 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Job
         }
         catch (Exception ex)
         {
-                _logger.LogError(ex, $"生成{DeviceTaskEnumType.UploadRecord.GetDescription()}任务失败:" + ex.Message);
+            _logger.LogError(ex, "生成{type}任务失败:{message}", DeviceTaskEnumType.UploadRecord.GetDescription(), ex.Message);
         }
         finally
         {
@@ -55,4 +56,3 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Job
         }
     }
 }
-}