From f17481e35bddd3be5b9cb8e8520d6f58c1ad2274 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Sat, 5 Jul 2025 14:37:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E5=A4=84=E7=90=86wait?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/CreateGetUploadRecordJob.cs | 10 ++++++++++ .../Jobs/CreateSyncServerDateTimeJob.cs | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) 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)