From 0c28e8d4d3198e0fa23f8ee8757eef72d8975abb Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Fri, 12 Jan 2024 15:49:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=20=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Controllers/DevicesController.cs       |  2 +-
 .../Device/Request/DevicePageRequest.cs           |  5 +++++
 Src/Dlhis.Basic/Device/Services/IDeviceService.cs |  2 +-
 .../Device/Services/Implements/DeviceService.cs   | 15 +++++++++++----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
index 3c34a593..b8eb02e0 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
@@ -145,7 +145,7 @@ public class DevicesController : ControllerBase
     /// <param name="UniqueNo"></param>
     /// <returns></returns>
     [HttpGet]
-    public async Task<DeviceResponse> GetSettingASync(string UniqueNo)
+    public async Task<Pagination<DeviceResponse>> GetSettingASync(string UniqueNo)
     {
         return await _deviceService.GetSettingASync(UniqueNo);
     }
diff --git a/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs b/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs
index ff56245f..f3b9da48 100644
--- a/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs
+++ b/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs
@@ -8,4 +8,9 @@ public class DevicePageRequest : PageDto
     /// 平台
     /// </summary>
     public string Brand { get; set; }
+
+   /// <summary>
+   /// 设备唯一号
+   /// </summary>
+    public string UniqueNo { get; set; }
 }
diff --git a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
index fb89564d..aa1ee214 100644
--- a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
@@ -12,5 +12,5 @@ public interface IDeviceService : IScopeDependency
 
     Task<bool> CheckExistsAsync(string deviceUniqueNo);
 
-    Task<DeviceResponse> GetSettingASync(string UniqueNo);
+    Task<Pagination<DeviceResponse>> GetSettingASync(string UniqueNo);
 }
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index d95194ac..6f19aede 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -151,11 +151,18 @@ public class DeviceService : IDeviceService
     /// </summary>
     /// <param name="UniqueNo"></param>
     /// <returns></returns>
-    public async Task<DeviceResponse> GetSettingASync(string UniqueNo)
+    public async Task<Pagination<DeviceResponse>> GetSettingASync(DevicePageRequest request)
     {
-        var dev =await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == UniqueNo).FirstAsync();
-        var deviceResponse = dev.Adapt<DeviceResponse>();
-        return deviceResponse;
+        var page = await _dbContext.Queryable<DeviceEntity>()
+            .Where(x=>x.UniqueNo == request.UniqueNo)
+               .Select(device => new DeviceResponse
+               {
+                   FuncsStr = device.Funcs.ToString()
+
+               }, true)
+               .ToPageListAsync(request);
+
+        return page;
     }
 }