yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 增加处理wait过期处理

Browse Source
This commit is contained in:
liguoyang
2025-07-05 14:37:13 +08:00
parent ba3a6082b7
commit f17481e35b
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs
View File

@@ -41,6 +41,16 @@ public class CreateGetUploadRecordJob : BaseJob
await DbContext.Deleteable<DeviceEntity>().Where(x => x.Id == id).ExecuteCommandAsync(); await DbContext.Deleteable<DeviceEntity>().Where(x => x.Id == id).ExecuteCommandAsync();
deviceTask = null; deviceTask = null;
} }
else if (deviceTask.Status == DeviceTaskStatusEnumType.Wait)
{
if (deviceTask.ModifiedTime.AddDays(3) < DateTime.Now)
{
// 如果任务等待时间超过3天，则删除任务
var id = deviceTask.Id;
await DbContext.Deleteable<DeviceEntity>().Where(x => x.Id == id).ExecuteCommandAsync();
deviceTask = null;
}
}
} }
if (deviceTask == null) if (deviceTask == null)

15
Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs
View File

@@ -31,12 +31,25 @@ public class CreateSyncServerDateTimeJob : BaseJob
if (deviceTask != null) 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; var id = deviceTask.Id;
await DbContext.Deleteable<DeviceEntity>().Where(x => x.Id == id).ExecuteCommandAsync(); await DbContext.Deleteable<DeviceEntity>().Where(x => x.Id == id).ExecuteCommandAsync();
deviceTask = null; deviceTask = null;
} }
else if (deviceTask.Status == DeviceTaskStatusEnumType.Wait)
{
if (deviceTask.ModifiedTime.AddDays(3) < DateTime.Now)
{
// 如果任务等待时间超过3天，则删除任务
var id = deviceTask.Id;
await DbContext.Deleteable<DeviceEntity>().Where(x => x.Id == id).ExecuteCommandAsync();
deviceTask = null;
}
}
} }
if (deviceTask == null) if (deviceTask == null)