fix 任务生成逻辑取反修改

This commit is contained in:
2024-02-26 17:50:22 +08:00
parent 96f89fa8d5
commit 33beb39408

View File

@@ -1,6 +1,7 @@
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Device.Enums;
using Kurisu.Core.DataAccess.Entity;
using Kurisu.SqlSugar.Services;
namespace Dlhis.ScheduledTask.TaskAssignment.Job
@@ -19,16 +20,18 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Job
public async Task RunAsync()
{
_dbContext.Client.QueryFilter.ClearAndBackup();
_dbContext.Client.QueryFilter.ClearAndBackup<ITenantId>();
try
{
var deviceUniqueNos = await _dbContext.Queryable<DeviceTaskEntity>().Where(x => x.Status == DeviceTaskStatusEnumType.Wait)
var deviceUniqueNos = await _dbContext.Queryable<DeviceTaskEntity>()
.Where(x => x.Status == DeviceTaskStatusEnumType.Wait || x.Status == DeviceTaskStatusEnumType.Process)
.Where(x => x.Type == DeviceTaskEnumType.SyncDateTime)
.Select(x => x.DeviceUniqueNo)
.Distinct()
.ToListAsync();
var devices = await _dbContext.Queryable<DeviceEntity>()
.Where(x => deviceUniqueNos.Contains(x.UniqueNo))
.Where(x => !deviceUniqueNos.Contains(x.UniqueNo))
.Where(x => x.Enable)
.ToListAsync();
@@ -54,7 +57,7 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Job
}
catch (Exception ex)
{
_logger.LogError(ex, "生成同步时间任务失败:" + ex.Message);
_logger.LogError(ex, "生成同步时间任务失败:{message}", ex.Message);
}
finally
{