From 28e4cbf513894ef1d49b056ac747c2cae1f4117d Mon Sep 17 00:00:00 2001 From: liguoyang Date: Sat, 6 Apr 2024 20:57:31 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=BB=E5=8A=A1=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/AssignmentService.cs | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index c94954c5..f9f212ff 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -15,6 +15,7 @@ using Newtonsoft.Json.Linq; using Kurisu.Core.CustomClass; using Kurisu.AspNetCore; using Kurisu.AspNetCore.Utils; +using Org.BouncyCastle.Asn1.Ocsp; namespace Dlhis.ScheduledTask.TaskAssignment.Services.Implements; @@ -33,9 +34,9 @@ public class AssignmentService : IAssignmentService public async Task> DeviceGetTasksAsync(DeviceTaskGetRequest request) { - //获取心跳设备 - var key = "heardbeat-devices"; - var heartbeatDeviceNos = (await _redisCache.ListRangeAsync(key))?.Select(x => x.ToString()).ToList(); + ////获取心跳设备 todo + //var key = "heardbeat-devices"; + //var heartbeatDeviceNos = (await _redisCache.ListRangeAsync(key))?.Select(x => x.ToString()).ToList(); var data = await ContinueUpdateAsync(async () => { @@ -49,7 +50,7 @@ public class AssignmentService : IAssignmentService .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) - .Where(deviceTask => heartbeatDeviceNos.Contains(deviceTask.DeviceUniqueNo)) + //.Where(deviceTask => heartbeatDeviceNos.Contains(deviceTask.DeviceUniqueNo)) .OrderBy(deviceTask => deviceTask.CreateTime) .Select((deviceTask, deivce, deivceTamplate, ga, department) => new { @@ -318,23 +319,18 @@ public class AssignmentService : IAssignmentService .Where(x => x.Status == DeviceTaskStatusEnumType.Process) .ToListAsync(); - taskIds = deviceTasks.Select(x => x.Id).ToList(); - - requests = requests.Where(x => taskIds.Contains(x.TaskId)).ToList(); - var now = DateTime.Now; - var tasks = new List(requests.Count); - foreach (var request in requests) + + deviceTasks.ForEach(task => { - var deviceTask = deviceTasks.First(x => x.Id == request.TaskId); + var callbackMessage = requests.First(x => x.TaskId == task.Id); - deviceTask.Status = request.IsSuccess ? DeviceTaskStatusEnumType.Success : DeviceTaskStatusEnumType.Error; - deviceTask.ResultMessage = request.ResultMessage; - deviceTask.ModifiedTime = now; - tasks.Add(deviceTask); - } + task.Status = callbackMessage.IsSuccess ? DeviceTaskStatusEnumType.Success : DeviceTaskStatusEnumType.Error; + task.ResultMessage = callbackMessage.ResultMessage; + task.ModifiedTime = now; + }); - await _dbContext.UpdateAsync(tasks); + await _dbContext.UpdateAsync(deviceTasks); }