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

stop 任务下发

Browse Source
This commit is contained in:
liguoyang
2024-12-25 13:25:14 +08:00
parent d6e8976ff2
commit 25f8c78340
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
View File

@@ -34,6 +34,8 @@ public class AssignmentService : IAssignmentService
public async Task<List<DeviceTaskToDeviceByDeviceResponse>> DeviceGetTasksAsync(DeviceTaskGetRequest request) public async Task<List<DeviceTaskToDeviceByDeviceResponse>> DeviceGetTasksAsync(DeviceTaskGetRequest request)
{ {
return new List<DeviceTaskToDeviceByDeviceResponse>();//todo
var data = await GetDataAsync(request); var data = await GetDataAsync(request);
if (data.IsEmpty()) return new List<DeviceTaskToDeviceByDeviceResponse>(); if (data.IsEmpty()) return new List<DeviceTaskToDeviceByDeviceResponse>();
@@ -264,7 +266,7 @@ public class AssignmentService : IAssignmentService
device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) > DateTime.Now) device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) > DateTime.Now)
#if !DEBUG #if !DEBUG
#endif #endif
.OrderBy(deviceTask => new { Priority = SqlFunc.Desc(deviceTask.Priority), deviceTask.CreateTime }) .OrderBy(deviceTask => new { deviceTask.CreateTime, Priority = SqlFunc.Desc(deviceTask.Priority) })
.Select((deviceTask, device, deviceTemplate, ga, gaLeave, department) => new TaskDto .Select((deviceTask, device, deviceTemplate, ga, gaLeave, department) => new TaskDto
{ {
UserId = deviceTask.UserId == 0 || deviceTask.UserId == null UserId = deviceTask.UserId == 0 || deviceTask.UserId == null