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 c4f3f2f..110065d 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 @@ -569,7 +569,20 @@ namespace YunDa.ISAS.Application.GeneralInformation if (boardCardSolftVersionOutput.RecodeDate.HasValue) { - historys.Add(boardCardSolftVersionOutput); + // 检查至少一个版本字符串不为空 + bool check = !string.IsNullOrEmpty(boardCardSolftVersionOutput.HardwareVersion) || + !string.IsNullOrEmpty(boardCardSolftVersionOutput.InterfaceVersion) || + !string.IsNullOrEmpty(boardCardSolftVersionOutput.ProtectionDatabaseVersion) || + !string.IsNullOrEmpty(boardCardSolftVersionOutput.InterfaceDatabaseVersion) || + !string.IsNullOrEmpty(boardCardSolftVersionOutput.ProtectionVersion) || + !string.IsNullOrEmpty(boardCardSolftVersionOutput.BootVersion) || + !string.IsNullOrEmpty(boardCardSolftVersionOutput.Iec61850Version) || + !string.IsNullOrEmpty(boardCardSolftVersionOutput.FpgaVersion); + if (check) + { + historys.Add(boardCardSolftVersionOutput); + } + } } rst.Flag = true; diff --git a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs index ca8a75e..3313e6b 100644 --- a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs +++ b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs @@ -631,6 +631,7 @@ namespace YunDa.ISAS.Application.GeneralInformation protectionDeviceSolfVersionOutput.BaselineBoardVersion = history.BaselineBoardVersion; protectionDeviceSolfVersionOutput.HardwareVersion = history.HardwareVersion; protectionDeviceSolfVersionOutput.RecodeDate = entity.RecodeDate; + protectionDeviceSolfVersionOutput.Name = entity.Name; } } else @@ -639,8 +640,9 @@ namespace YunDa.ISAS.Application.GeneralInformation protectionDeviceSolfVersionOutput.BaselineBoardVersion = history.BaselineBoardVersion; protectionDeviceSolfVersionOutput.HardwareVersion = history.HardwareVersion; protectionDeviceSolfVersionOutput.RecodeDate = entity.RecodeDate; + protectionDeviceSolfVersionOutput.Name = entity.Name; } - if (!string.IsNullOrWhiteSpace( protectionDeviceSolfVersionOutput.BaselineBoardVersion)) + if (protectionDeviceSolfVersionOutput.RecodeDate.HasValue&&!string.IsNullOrWhiteSpace(protectionDeviceSolfVersionOutput.BaselineBoardVersion)) { historys.Add(protectionDeviceSolfVersionOutput); } 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 792428f..fe37d25 100644 --- a/src/YunDa.Application/YunDa.ISAS.Application/YunDa.ISAS.Application.xml +++ b/src/YunDa.Application/YunDa.ISAS.Application/YunDa.ISAS.Application.xml @@ -2717,20 +2717,6 @@ 初始化遥信队列 - - - 获取遥信数据 - - 所亭名称 - - - - - 获取遥测数据 - - 所亭名称 - - 获取可以选择的设备下拉列表 @@ -3425,6 +3411,13 @@ + + + 查询板卡历史版本数据 + + + + 获取板卡状态 @@ -3513,6 +3506,13 @@ + + + 查询历史保护装置版本信息 + + + + 获取所有保护装置 @@ -3568,6 +3568,13 @@ + + + 查询保护装置历史版本信息 + + + + 获取保护装置列表 diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/HistoryData/BoardCardSolftVersionOutput.cs b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/HistoryData/BoardCardSolftVersionOutput.cs index 405ffa3..0135bcb 100644 --- a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/HistoryData/BoardCardSolftVersionOutput.cs +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/HistoryData/BoardCardSolftVersionOutput.cs @@ -11,6 +11,9 @@ namespace YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoD [AutoMapFrom(typeof(BoardCardInfo))] public class BoardCardSolftVersionOutput { + public string BoardId { get; set; } // 板卡号 + + public string BoardType { get; set; } // 板卡类型 /// /// 记录时间 /// @@ -21,7 +24,14 @@ namespace YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoD public string InterfaceChecksum { get; set; } // 接口程序校验码 - public string DatabaseVersion { get; set; } // 数据库版本 + /// + /// 接口数据库版本 + /// + public string InterfaceDatabaseVersion { get; set; } // 数据库版本 + /// + /// 保护数据库版本 + /// + public string ProtectionDatabaseVersion { get; set; } // 数据库版本 public string ProtectionVersion { get; set; } // 保护程序版本 diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/HistoryData/ProtectionDeviceSolfVersionOutput.cs b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/HistoryData/ProtectionDeviceSolfVersionOutput.cs index e018164..020c77b 100644 --- a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/HistoryData/ProtectionDeviceSolfVersionOutput.cs +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/HistoryData/ProtectionDeviceSolfVersionOutput.cs @@ -8,6 +8,7 @@ namespace YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoD { public class ProtectionDeviceSolfVersionOutput { + public virtual string Name { get; set; } /// /// 记录时间 /// diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml index 8c558e2..241f67b 100644 --- a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml @@ -15063,6 +15063,21 @@ 检验记录 + + + 记录时间 + + + + + 接口数据库版本 + + + + + 保护数据库版本 + + 顺序号 @@ -15143,6 +15158,21 @@ 检验记录 + + + 记录时间 + + + + + 基线版本 + + + + + 硬件版本 + + 保护装置通信地址