fix 优先级

Src/Dlhis.Entity/Device/Entities/DeviceTaskEntity.cs

@@ -65,6 +65,12 @@ public class DeviceTaskEntity : SugarBaseEntity, ITenantId, IVersion
     [SugarColumn(DefaultValue = "0")]
     public long CancellationId { get; set; } = 0;
 
+    /// <summary>
+    /// 优先级
+    /// </summary>
+    [SugarColumn(DefaultValue = "0")]
+    public int Priority { get; set; } = 0;
+
 
     public string TenantId { get; set; }
 }

Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs

@@ -40,6 +40,7 @@ public class CreateGetUploadRecordJob : BaseJob
             Version = 0,
             Type = DeviceTaskEnumType.UploadRecord,
             CancellationId = 0,
+            Priority = 50,
 
             CreatedBy = 1,
             CreateTime = DateTime.Now,

Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs

@@ -41,6 +41,7 @@ public class CreateSyncServerDateTimeJob : BaseJob
             UserNo = string.Empty,
             Type = DeviceTaskEnumType.SyncDateTime,
             DeviceType = x.Type,
+            Priority = 49,
 
             CreatedBy = 1,
             CreateTime = DateTime.Now,

Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs

@@ -51,9 +51,20 @@ public class AssignmentService : IAssignmentService
              .WhereIF(request.DeviceUniqueNo.IsPresent(), (deviceTask, deivce) => deviceTask.DeviceUniqueNo == request.DeviceUniqueNo)
              .WhereIF(request.Types.IsPresent(), deviceTask => request.Types.Contains(deviceTask.Type))
              .WhereIF(!request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Wait)
-             .WhereIF(request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Process && SqlFunc.DateDiff(DateType.Minute, deviceTask.CreateTime, deviceTask.ModifiedTime) > 30)
+             .WhereIF(request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Process
+             && SqlFunc.DateDiff(DateType.Minute, deviceTask.CreateTime, deviceTask.ModifiedTime) > 30)
              //.Where(deviceTask => heartbeatDeviceNos.Contains(deviceTask.DeviceUniqueNo))
-             .OrderBy(deviceTask => deviceTask.CreateTime)
+             .OrderBy(deviceTask => new List<OrderByModel>
+             {
+                 new()
+                 {
+                      FieldName = nameof(DeviceTaskEntity.Priority), OrderByType = OrderByType.Desc,
+                 },
+                 new()
+                 {
+                      FieldName = nameof(DeviceTaskEntity.CreateTime), OrderByType = OrderByType.Asc,
+                 },
+             })
              .Select((deviceTask, deivce, deivceTamplate, ga, galeave, department) => new
              {
                  UserId = SqlFunc.IsNull(SqlFunc.IsNull(deviceTask.UserId, ga.Id), galeave.IdentityUserId),