From 7934ef584533cae85a627ace9cb8be2d04fcd7c6 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 19 Nov 2024 09:29:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpenApi/Controllers/DeviceController.cs | 1 + .../OpenApi/Response/DeviceResponse.cs | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Src/Dlhis.External/OpenApi/Controllers/DeviceController.cs b/Src/Dlhis.External/OpenApi/Controllers/DeviceController.cs index e6219b55..669fa165 100644 --- a/Src/Dlhis.External/OpenApi/Controllers/DeviceController.cs +++ b/Src/Dlhis.External/OpenApi/Controllers/DeviceController.cs @@ -36,6 +36,7 @@ public class DevicesController : ControllerBase .Select((x, xr) => new DeviceResponse { DeviceNo = x.UniqueNo, + DeployPlace = x.DeployPlace, HeartbeatInterval = x.HeartbeatInterval, DirectionType = x.DeployDirection, LastHeartbeatTime = xr.LastHeartbeatTime, diff --git a/Src/Dlhis.External/OpenApi/Response/DeviceResponse.cs b/Src/Dlhis.External/OpenApi/Response/DeviceResponse.cs index 1bdd81a7..75fcd769 100644 --- a/Src/Dlhis.External/OpenApi/Response/DeviceResponse.cs +++ b/Src/Dlhis.External/OpenApi/Response/DeviceResponse.cs @@ -11,19 +11,23 @@ public class DeviceResponse /// public int HeartbeatInterval { get; set; } - + /// /// 设备类型, 1:门禁, 3:考勤 /// public DeviceTypeEnumType Type { get; set; } - + /// /// 部署方向,10:进;20:出 /// public DeviceDeployDirectionEnumType? DirectionType { get; set; } - - + + /// + /// 部署点位 + /// + public string DeployPlace { get; set; } + /// /// 最后心跳时间 ///