diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs index eac45bc7..723fbf63 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs @@ -1,11 +1,11 @@ using Dlhis.ScheduledTask.DeviceUploadLog.Request; using Dlhis.ScheduledTask.DeviceUploadLog.Response; using Dlhis.ScheduledTask.DeviceUploadLog.Services; +using Kurisu.AspNetCore.CustomClass; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Org.BouncyCastle.Asn1.Crmf; namespace Dlhis.ScheduledTask.DeviceUploadLog.Controllers; @@ -67,4 +67,15 @@ public class DeviceUploadLogsController : ControllerBase { await _deviceUploadLogService.QiaoqiaoGaoshiqingAsync(request); } + + /// + /// 获取设备记录读取的配置 + /// + /// + /// + [HttpGet("setting")] + public async Task GetDeviceUploadRecordSettingAsync(string deviceNo) + { + return await _deviceUploadLogService.GetDeviceUploadRecordSettingAsync(deviceNo); + } } \ No newline at end of file diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/IDeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/IDeviceUploadLogService.cs index f93f996d..0d70899b 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/IDeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/IDeviceUploadLogService.cs @@ -1,5 +1,6 @@ using Dlhis.ScheduledTask.DeviceUploadLog.Request; using Dlhis.ScheduledTask.DeviceUploadLog.Response; +using Kurisu.AspNetCore.CustomClass; using Kurisu.AspNetCore.DataAccess.Dto; namespace Dlhis.ScheduledTask.DeviceUploadLog.Services; @@ -13,4 +14,12 @@ public interface IDeviceUploadLogService : IScopeDependency Task> GetMyRecordsAsync(DeviceUploadLogMyRecordRequest request); Task QiaoqiaoGaoshiqingAsync(DeviceUploadLogSecretAddRequest request); + + + /// + /// 获取设备记录获取的开始-结束时间 + /// + /// + /// + Task GetDeviceUploadRecordSettingAsync(string deviceNo); } diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index ffa3c824..543ef475 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -75,6 +75,20 @@ public class DeviceUploadLogService : IDeviceUploadLogService }); } + public async Task GetDeviceUploadRecordSettingAsync(string deviceNo) + { + var start = await _dbContext.Queryable() + .Where(x => x.DeviceUniqueNo == deviceNo) + .Select(x => SqlFunc.AggregateMax(x.RaiseDateTime)) + .SingleAsync(); + + return new DateTimePeriod + { + Start = start, + End = DateTime.Now.AddDays(1) + }; + } + public async Task> GetPageAsync(DeviceUploadLogPageRequest request) { DeviceUploadLogTypeEnumType? type = request.Type switch diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/IAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/IAssignmentService.cs index 9a725a9e..e8f07cd5 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/IAssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/IAssignmentService.cs @@ -12,11 +12,10 @@ public interface IAssignmentService : IScopeDependency /// Task> DeviceGetTasksAsync(DeviceTaskGetRequest request); - /// /// 更新设备任务状态 /// /// /// Task UpdateDeviceTaskStatusAsync(List requests); -} +} \ No newline at end of file diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 04175169..8726c644 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -263,7 +263,6 @@ public class AssignmentService : IAssignmentService .Where((deviceTask, device, deviceTemplate, ga, gaLeave, department, deviceRegistry) => device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) > DateTime.Now) #if !DEBUG - #endif .OrderBy(deviceTask => new { Priority = SqlFunc.Desc(deviceTask.Priority), deviceTask.CreateTime }) .Select((deviceTask, device, deviceTemplate, ga, gaLeave, department) => new TaskDto @@ -353,6 +352,9 @@ public class AssignmentService : IAssignmentService return result; } + + + /// /// 处理老档案数据 ///