From 390452f57bb36a80e8e9d6bd8001cab826cd025a Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 29 Oct 2024 13:55:34 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DeviceUploadLogsController.cs      | 13 ++++++++++++-
 .../Services/IDeviceUploadLogService.cs            |  9 +++++++++
 .../Services/Implements/DeviceUploadLogService.cs  | 14 ++++++++++++++
 .../TaskAssignment/Services/IAssignmentService.cs  |  3 +--
 .../Services/Implements/AssignmentService.cs       |  4 +++-
 5 files changed, 39 insertions(+), 4 deletions(-)

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);
     }
+
+    /// <summary>
+    /// 获取设备记录读取的配置
+    /// </summary>
+    /// <param name="deviceNo"></param>
+    /// <returns></returns>
+    [HttpGet("setting")]
+    public async Task<DateTimePeriod> 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<List<DeviceUploadLogResponse>> GetMyRecordsAsync(DeviceUploadLogMyRecordRequest request);
 
     Task QiaoqiaoGaoshiqingAsync(DeviceUploadLogSecretAddRequest request);
+    
+    
+    /// <summary>
+    /// 获取设备记录获取的开始-结束时间
+    /// </summary>
+    /// <param name="deviceNo"></param>
+    /// <returns></returns>
+    Task<DateTimePeriod> 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<DateTimePeriod> GetDeviceUploadRecordSettingAsync(string deviceNo)
+    {
+        var start = await _dbContext.Queryable<DeviceUploadLogEntity>()
+            .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<Pagination<DeviceUploadLogResponse>> 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
     /// <returns></returns>
     Task<List<DeviceTaskToDeviceByDeviceResponse>> DeviceGetTasksAsync(DeviceTaskGetRequest request);
 
-
     /// <summary>
     /// 更新设备任务状态
     /// </summary>
     /// <param name="requests"></param>
     /// <returns></returns>
     Task UpdateDeviceTaskStatusAsync(List<UpdateDeviceTaskStatusRequest> 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;
     }
 
+
+
+
     /// <summary>
     /// 处理老档案数据
     /// </summary>