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
///
///
[HttpGet("page")]
- public async Task> GetPageAsync([FromQuery] DevicePageRequest request)
+ public async Task> 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; }
+
+ ///
+ /// 设备code
+ ///
+ public Guid Code { get; set; }
+
+ ///
+ /// 设备唯一码,IP/MAC/SNO
+ ///
+ public string UniqueNo { get; set; }
+
+ ///
+ /// 心跳间隔
+ ///
+ public int HeartbeatInterval { get; set; }
+
+ ///
+ /// 品牌
+ ///
+ public string Brand { get; set; }
+
+ ///
+ /// 供应商
+ ///
+ public string Supplier { get; set; }
+
+ ///
+ /// 设备功能 DeviceFuncEnumType
+ ///
+ public List Funcs
+ {
+ get
+ {
+ if (FuncsStr.IsEmpty()) FuncsStr = "[]";
+
+ return FuncsStr.ToObject>();
+ }
+ }
+
+ public string FuncsStr { get; set; }
+
+ ///
+ /// 部署点
+ ///
+ public string DeployPlace { get; set; }
+
+ ///
+ /// 部署坐标
+ ///
+ public string DeployPosition { get; set; }
+
+ ///
+ /// 部署方向
+ ///
+ public string DeployDirection { get; set; }
+
+ ///
+ /// 模板code
+ ///
+ public Guid TemplateCode { get; set; }
+
+ ///
+ /// 连接信息
+ ///
+ public string ConnectionInfo { get; set; }
+
+
+ ///
+ /// 是否启用
+ ///
+ 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> GetPageAsync(DevicePageRequest request);
+ Task> 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> GetPageAsync(DevicePageRequest request)
+ public async Task> GetPageAsync(DevicePageRequest request)
{
var page = await _dbContext.Queryable()
.Select(device => new DeviceResponse