diff --git a/Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs index b17db4e9..e4feab8c 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs @@ -41,6 +41,16 @@ public class CreateGetUploadRecordJob : BaseJob await DbContext.Deleteable().Where(x => x.Id == id).ExecuteCommandAsync(); deviceTask = null; } + else if (deviceTask.Status == DeviceTaskStatusEnumType.Wait) + { + if (deviceTask.ModifiedTime.AddDays(3) < DateTime.Now) + { + // 如果任务等待时间超过3天,则删除任务 + var id = deviceTask.Id; + await DbContext.Deleteable().Where(x => x.Id == id).ExecuteCommandAsync(); + deviceTask = null; + } + } } if (deviceTask == null) diff --git a/Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs index 9417c7cb..25b4d3b2 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs @@ -31,12 +31,25 @@ public class CreateSyncServerDateTimeJob : BaseJob if (deviceTask != null) { - if (deviceTask.Status is DeviceTaskStatusEnumType.Success or DeviceTaskStatusEnumType.Process or DeviceTaskStatusEnumType.Error) + if (deviceTask.Status is DeviceTaskStatusEnumType.Success + or DeviceTaskStatusEnumType.Process + or DeviceTaskStatusEnumType.Error + ) { var id = deviceTask.Id; await DbContext.Deleteable().Where(x => x.Id == id).ExecuteCommandAsync(); deviceTask = null; } + else if (deviceTask.Status == DeviceTaskStatusEnumType.Wait) + { + if (deviceTask.ModifiedTime.AddDays(3) < DateTime.Now) + { + // 如果任务等待时间超过3天,则删除任务 + var id = deviceTask.Id; + await DbContext.Deleteable().Where(x => x.Id == id).ExecuteCommandAsync(); + deviceTask = null; + } + } } if (deviceTask == null)