guorui/SOMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.110.57:3000/guor/SOMS

Browse Source
This commit is contained in:
郭睿 2024-12-09 14:44:43 +08:00
commit d52d3829bb
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/BoardCardDevice/BoardCardInfoAppService.cs
View File

@ -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;
}
}

18
src/YunDa.Application/YunDa.ISAS.Application/YunDa.ISAS.Application.xml
View File

@ -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>