From 5907fcf67e5980ee8e2154a108f57fb7104573a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E7=9D=BFAMD7950X?= <774114798@qq.com>
Date: Mon, 9 Dec 2024 11:05:46 +0800
Subject: [PATCH] 1

---
 .../BoardCardInfoAppService.cs                | 21 ++++++++++++++++++-
 .../YunDa.ISAS.Application.xml                | 18 +++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/BoardCardDevice/BoardCardInfoAppService.cs b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/BoardCardDevice/BoardCardInfoAppService.cs
index eb9be3c..596548b 100644
--- a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/BoardCardDevice/BoardCardInfoAppService.cs
+++ b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/BoardCardDevice/BoardCardInfoAppService.cs
@@ -335,6 +335,17 @@ namespace YunDa.ISAS.Application.GeneralInformation
         }
         
         string deviceBoardStatesRedisKey = "deviceBoardStates";
+        List<NameIntValueProperty> iopositions = new List<NameIntValueProperty>
+        {
+            new NameIntValueProperty("运行", 0),
+            new NameIntValueProperty("告警", 0),
+            new NameIntValueProperty("IO插件1", 0),
+            new NameIntValueProperty("IO插件2", 0),
+            new NameIntValueProperty("IO插件3", 0),
+            new NameIntValueProperty("IO插件4", 0),
+            new NameIntValueProperty("电源插件（IO5）", 0),
+            new NameIntValueProperty("液晶", 0)
+        };
         /// <summary>
         /// 获取板卡状态
         /// </summary>
@@ -362,7 +373,15 @@ namespace YunDa.ISAS.Application.GeneralInformation
                 {
 
                     var state = await _deviceBoardStatesRedis.HashSetGetAllAsync(deviceBoardStatesRedisKey, protectionDeviceInfo.DeviceAddress.ToString());
-                    rst.ResultData = state.States.Select(t=>new DeviceRunState { Name = t.Name,State = t.Value}).ToList();
+                    if (state != null) 
+                    {
+                        rst.ResultData = state.States.Select(t => new DeviceRunState { Name = t.Name, State = t.Value }).ToList();
+                    }
+                    else
+                    {
+                        rst.ResultData = iopositions.Select(t => new DeviceRunState { Name = t.Name, State = t.Value }).ToList();
+
+                    }
                     rst.Flag = true;
                 }
             }
diff --git a/src/YunDa.Application/YunDa.ISAS.Application/YunDa.ISAS.Application.xml b/src/YunDa.Application/YunDa.ISAS.Application/YunDa.ISAS.Application.xml
index 581740c..2e30f00 100644
--- a/src/YunDa.Application/YunDa.ISAS.Application/YunDa.ISAS.Application.xml
+++ b/src/YunDa.Application/YunDa.ISAS.Application/YunDa.ISAS.Application.xml
@@ -3472,6 +3472,14 @@
             <param name="equipmentInfoId"></param>
             <returns></returns>
         </member>
+        <member name="M:YunDa.ISAS.Application.GeneralInformation.IBoardCardInfoAppService.GetBoardStateInfo(System.Guid,System.Guid)">
+            <summary>
+            查询板卡在线信息
+            </summary>
+            <param name="equipmentId"></param>
+            <param name="deviceId"></param>
+            <returns></returns>
+        </member>
         <member name="M:YunDa.ISAS.Application.GeneralInformation.IProtectionDeviceAppService.FindDataByEquipmentInfoId(System.Nullable{System.Guid})">
             <summary>
             查询保护设备信息
@@ -3493,6 +3501,14 @@
             <param name="stationId"></param>
             <returns></returns>
         </member>
+        <member name="M:YunDa.ISAS.Application.GeneralInformation.IProtectionDeviceAppService.GetDeviceEventType(System.Int32,System.Int32)">
+            <summary>
+            获取装置事件类型
+            </summary>
+            <param name="deviceAddr"></param>
+            <param name="eventCode"></param>
+            <returns></returns>
+        </member>
         <member name="T:YunDa.ISAS.Application.GeneralInformation.ProtectionDeviceAppService">
             <summary>
             保护装置履历信息管理类
@@ -3572,7 +3588,7 @@
         </member>
         <member name="M:YunDa.ISAS.Application.GeneralInformation.ProtectionDeviceAppService.GetDeviceEventType(System.Int32,System.Int32)">
             <summary>
-            获取装置时间类型
+            获取装置事件类型
             </summary>
             <param name="deviceAddr"></param>
             <param name="eventCode"></param>