From 9f953767a386729b06e116016793586ac92f4ed7 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 8 May 2025 14:15:55 +0800
Subject: [PATCH] =?UTF-8?q?add=20ip=E5=AD=97=E6=AE=B5=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        | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/Src/Dlhis.External/OpenApi/Controllers/DeviceController.cs b/Src/Dlhis.External/OpenApi/Controllers/DeviceController.cs
index 63d43761..cb0f5362 100644
--- a/Src/Dlhis.External/OpenApi/Controllers/DeviceController.cs
+++ b/Src/Dlhis.External/OpenApi/Controllers/DeviceController.cs
@@ -41,6 +41,7 @@ public class DevicesController : ControllerBase
                 HeartbeatInterval = x.HeartbeatInterval,
                 DirectionType = x.DeployDirection,
                 LastHeartbeatTime = xr.LastHeartbeatTime,
+                ConnectionInfo = x.ConnectionInfo
             })
             .ToListAsync();
     }
diff --git a/Src/Dlhis.External/OpenApi/Response/DeviceResponse.cs b/Src/Dlhis.External/OpenApi/Response/DeviceResponse.cs
index 75fcd769..41b47ee5 100644
--- a/Src/Dlhis.External/OpenApi/Response/DeviceResponse.cs
+++ b/Src/Dlhis.External/OpenApi/Response/DeviceResponse.cs
@@ -1,4 +1,7 @@
 using Dlhis.Entity.Device.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Dlhis.External.OpenApi.Response;
 
@@ -49,4 +52,27 @@ public class DeviceResponse
             return LastHeartbeatTime.Value.AddSeconds(HeartbeatInterval) >= DateTime.Now;
         }
     }
+
+    [JsonIgnore]
+    public string ConnectionInfo { get; set; }
+
+    /// <summary>
+    /// 设备列表
+    /// </summary>
+    public string Ip
+    {
+        get
+        {
+            if (!ConnectionInfo.IsPresent())
+            {
+                return string.Empty;
+            }
+
+            var jObj = JObject.Parse(ConnectionInfo);
+            
+            return jObj.TryGetValue("ip", out var ip)
+                ? ip.Value<string>()
+                : string.Empty;
+        }
+    }
 }
\ No newline at end of file