From 4823105e6293a84173d908d4ee1cfc437ef245b9 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Wed, 11 May 2022 16:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Device/BaseDevice.cs | 18 ++++++++++++++++--
 BPASmartClient.Device/IDevice.cs    | 11 ++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs
index 51f1b77f..246267d8 100644
--- a/BPASmartClient.Device/BaseDevice.cs
+++ b/BPASmartClient.Device/BaseDevice.cs
@@ -76,8 +76,7 @@ namespace BPASmartClient.Device
         public List<object> Error { get; set; } = new List<object>();
 
         public List<VariableMonitor> variableMonitors { get; set; } = new List<VariableMonitor>();
-        ConcurrentDictionary<string, object> IDevice.Log { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        ConcurrentDictionary<string, object> IDevice.Error { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        
 
         /// <summary>
         /// 外设状态,硬件设备数据
@@ -434,6 +433,7 @@ namespace BPASmartClient.Device
 
         public object GetError()
         {
+            object time= GetPropertyValue(Error[0], "Time");
             return new { data = Error };
         }
 
@@ -446,5 +446,19 @@ namespace BPASmartClient.Device
         {
             return new { data = variableMonitors };
         }
+
+        /// <summary>
+        /// 获取某个对象中的属性值
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="field"></param>
+        /// <returns></returns>
+        public object GetPropertyValue(object info, string field)
+        {
+            if (info == null) return null;
+            Type t = info.GetType();
+            IEnumerable<System.Reflection.PropertyInfo> property = from pi in t.GetProperties() where pi.Name.ToLower() == field.ToLower() select pi;
+            return property.First().GetValue(info, null);
+        }
     }
 }
diff --git a/BPASmartClient.Device/IDevice.cs b/BPASmartClient.Device/IDevice.cs
index d755a731..eb0fbe70 100644
--- a/BPASmartClient.Device/IDevice.cs
+++ b/BPASmartClient.Device/IDevice.cs
@@ -33,11 +33,11 @@ namespace BPASmartClient.Device
         /// <summary>
         /// 运行日志
         /// </summary>
-        public ConcurrentDictionary<string, object> Log { get; set; }
+        public List<object> Log { get; set; }
         /// <summary>
         /// 运行告警
         /// </summary>
-        public ConcurrentDictionary<string, object> Error { get; set; }
+        public List<object> Error { get; set; }
         /// <summary>
         /// 设备变量信息
         /// </summary>
@@ -75,6 +75,11 @@ namespace BPASmartClient.Device
         /// 获取硬件信息
         /// </summary>
         object GetVariableMonitor();
-
+        /// <summary>
+        /// 获取属性变量
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="field"></param>
+        object GetPropertyValue(object info, string field);
     }
 }