From e669134fea4f16297fc4d11bac2d7750b0b4e404 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 25 Jan 2024 14:29:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8D=95=E7=8B=AC=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=86=E9=A1=B5=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Controllers/DevicesController.cs   |  7 +-
 .../Device/Response/DevicePageResponse.cs     | 80 +++++++++++++++++++
 .../Device/Services/IDeviceService.cs         |  2 +-
 .../Services/Implements/DeviceService.cs      |  2 +-
 4 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs

diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
index 2e089366..0fc36ce8 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
@@ -20,7 +20,10 @@ public class DevicesController : ControllerBase
     private readonly IDeviceConnectService _deviceConnectService;
     private readonly IConfiguration _configuration;
 
-    public DevicesController(IDeviceService deviceService, IDeviceTemplateService deviceTemplateService, IDeviceConnectService deviceConnectService, IConfiguration configuration)
+    public DevicesController(IDeviceService deviceService, 
+        IDeviceTemplateService deviceTemplateService, 
+        IDeviceConnectService deviceConnectService, 
+        IConfiguration configuration)
     {
         _deviceService = deviceService;
         _deviceTemplateService = deviceTemplateService;
@@ -56,7 +59,7 @@ public class DevicesController : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpGet("page")]
-    public async Task<Pagination<DeviceResponse>> GetPageAsync([FromQuery] DevicePageRequest request)
+    public async Task<Pagination<DevicePageResponse>> GetPageAsync([FromQuery] DevicePageRequest request)
     {
         return await _deviceService.GetPageAsync(request);
     }
diff --git a/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
new file mode 100644
index 00000000..3269982a
--- /dev/null
+++ b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
@@ -0,0 +1,80 @@
+using Dlhis.Entity.Device.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
+namespace Dlhis.Basic.Device.Response;
+
+public class DevicePageResponse
+{
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 设备code
+    /// </summary>
+    public Guid Code { get; set; }
+
+    /// <summary>
+    /// 设备唯一码,IP/MAC/SNO
+    /// </summary>
+    public string UniqueNo { get; set; }
+
+    /// <summary>
+    /// 心跳间隔
+    /// </summary>
+    public int HeartbeatInterval { get; set; }
+
+    /// <summary>
+    /// 品牌
+    /// </summary>
+    public string Brand { get; set; }
+
+    /// <summary>
+    /// 供应商
+    /// </summary>
+    public string Supplier { get; set; }
+
+    /// <summary>
+    /// 设备功能 DeviceFuncEnumType
+    /// </summary>
+    public List<DeviceFuncEnumType> Funcs
+    {
+        get
+        {
+            if (FuncsStr.IsEmpty()) FuncsStr = "[]";
+
+            return FuncsStr.ToObject<List<DeviceFuncEnumType>>();
+        }
+    }
+
+    public string FuncsStr { get; set; }
+
+    /// <summary>
+    /// 部署点
+    /// </summary>
+    public string DeployPlace { get; set; }
+
+    /// <summary>
+    /// 部署坐标
+    /// </summary>
+    public string DeployPosition { get; set; }
+
+    /// <summary>
+    /// 部署方向
+    /// </summary>
+    public string DeployDirection { get; set; }
+
+    /// <summary>
+    /// 模板code
+    /// </summary>
+    public Guid TemplateCode { get; set; }
+
+    /// <summary>
+    /// 连接信息
+    /// </summary>
+    public string ConnectionInfo { get; set; }
+
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public bool Enable { get; set; }
+}
diff --git a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
index eb429293..095effcb 100644
--- a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
@@ -6,7 +6,7 @@ namespace Dlhis.Basic.Device.Services;
 
 public interface IDeviceService : IScopeDependency
 {
-    Task<Pagination<DeviceResponse>> GetPageAsync(DevicePageRequest request);
+    Task<Pagination<DevicePageResponse>> GetPageAsync(DevicePageRequest request);
 
     Task SaveAsync(DeviceSaveRequest request);
 
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index 0e4f5dcb..ac6e0adb 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -24,7 +24,7 @@ public class DeviceService : IDeviceService
         _dbContext = dbContext;
     }
 
-    public async Task<Pagination<DeviceResponse>> GetPageAsync(DevicePageRequest request)
+    public async Task<Pagination<DevicePageResponse>> GetPageAsync(DevicePageRequest request)
     {
         var page = await _dbContext.Queryable<DeviceEntity>()
                .Select(device => new DeviceResponse