1

src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/BoardCardDevice/BoardCardInfoAppService.cs

@@ -568,9 +568,22 @@ namespace YunDa.ISAS.Application.GeneralInformation
                         }
 
                         if (boardCardSolftVersionOutput.RecodeDate.HasValue)
+                        {
+                            // 检查至少一个版本字符串不为空
+                            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;
                     rst.ResultData = historys;

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

src/YunDa.Application/YunDa.ISAS.Application/YunDa.ISAS.Application.xml

@@ -2717,20 +2717,6 @@
             初始化遥信队列
             </summary>
         </member>
-        <member name="M:YunDa.ISAS.Application.GeneralInformation.EquipmentInfoExAppService.GetYXData(System.String)">
-            <summary>
-            获取遥信数据
-            </summary>
-            <param name="stationName">所亭名称</param>
-            <returns></returns>
-        </member>
-        <member name="M:YunDa.ISAS.Application.GeneralInformation.EquipmentInfoExAppService.GetYCData(System.String)">
-            <summary>
-            获取遥测数据
-            </summary>
-            <param name="stationName">所亭名称</param>
-            <returns></returns>
-        </member>
         <member name="M:YunDa.ISAS.Application.GeneralInformation.IEquipmentInfoAppService.FindEquipmentInfoForSelect(YunDa.ISAS.DataTransferObject.GeneralInformation.EquipmentInfoDto.SearchCondition.SelectEquipmentInfoSearchConditionInput)">
             <summary>
             获取可以选择的设备下拉列表
@@ -3425,6 +3411,13 @@
             <param name="equipmentInfoId"></param>
             <returns></returns>
         </member>
+        <member name="M:YunDa.ISAS.Application.GeneralInformation.BoardCardInfoAppService.FindHistorySoftVersionByEquipmentInfoId(System.Nullable{System.Guid})">
+            <summary>
+            查询板卡历史版本数据
+            </summary>
+            <param name="equipmentInfoId"></param>
+            <returns></returns>
+        </member>
         <member name="M:YunDa.ISAS.Application.GeneralInformation.BoardCardInfoAppService.GetBoardStateInfo(System.Guid,System.Guid)">
             <summary>
             获取板卡状态
@@ -3513,6 +3506,13 @@
             <param name="equipmentInfoId"></param>
             <returns></returns>
         </member>
+        <member name="M:YunDa.ISAS.Application.GeneralInformation.IProtectionDeviceAppService.FindHistorySoftVersionDataByEquipmentInfoId(System.Nullable{System.Guid})">
+            <summary>
+            查询历史保护装置版本信息
+            </summary>
+            <param name="equipmentInfoId"></param>
+            <returns></returns>
+        </member>
         <member name="M:YunDa.ISAS.Application.GeneralInformation.IProtectionDeviceAppService.FindProtectionDeviceForSelect(System.Guid)">
             <summary>
             获取所有保护装置
@@ -3568,6 +3568,13 @@
             <param name="equipmentInfoId"></param>
             <returns></returns>
         </member>
+        <member name="M:YunDa.ISAS.Application.GeneralInformation.ProtectionDeviceAppService.FindHistorySoftVersionDataByEquipmentInfoId(System.Nullable{System.Guid})">
+            <summary>
+            查询保护装置历史版本信息
+            </summary>
+            <param name="equipmentInfoId"></param>
+            <returns></returns>
+        </member>
         <member name="M:YunDa.ISAS.Application.GeneralInformation.ProtectionDeviceAppService.FindProtectionDeviceForSelect(System.Guid)">
             <summary>
             获取保护装置列表

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; } // 板卡类型
         /// <summary>
         /// 记录时间
         /// </summary>
@@ -21,7 +24,14 @@ namespace YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoD
 
         public string InterfaceChecksum { get; set; } // 接口程序校验码
 
-        public string DatabaseVersion { get; set; } // 数据库版本
+        /// <summary>
+        /// 接口数据库版本
+        /// </summary>
+        public string InterfaceDatabaseVersion { get; set; } // 数据库版本
+        /// <summary>
+        /// 保护数据库版本
+        /// </summary>
+        public string ProtectionDatabaseVersion { get; set; } // 数据库版本
 
         public string ProtectionVersion { get; set; } // 保护程序版本
 

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; }
         /// <summary>
         /// 记录时间
         /// </summary>

src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml

@@ -15063,6 +15063,21 @@
             检验记录
             </summary>
         </member>
+        <member name="P:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.HistoryData.BoardCardSolftVersionOutput.RecodeDate">
+            <summary>
+            记录时间
+            </summary>
+        </member>
+        <member name="P:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.HistoryData.BoardCardSolftVersionOutput.InterfaceDatabaseVersion">
+            <summary>
+            接口数据库版本
+            </summary>
+        </member>
+        <member name="P:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.HistoryData.BoardCardSolftVersionOutput.ProtectionDatabaseVersion">
+            <summary>
+            保护数据库版本
+            </summary>
+        </member>
         <member name="P:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.HistoryData.ProtectionDeviceHistoryOutput.SeqNo">
             <summary>
             顺序号
@@ -15143,6 +15158,21 @@
             检验记录
             </summary>
         </member>
+        <member name="P:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.HistoryData.ProtectionDeviceSolfVersionOutput.RecodeDate">
+            <summary>
+            记录时间
+            </summary>
+        </member>
+        <member name="P:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.HistoryData.ProtectionDeviceSolfVersionOutput.BaselineBoardVersion">
+            <summary>
+            基线版本
+            </summary>
+        </member>
+        <member name="P:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.HistoryData.ProtectionDeviceSolfVersionOutput.HardwareVersion">
+            <summary>
+            硬件版本
+            </summary>
+        </member>
         <member name="T:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.ProtectionDeviceCommInfoOutput">
             <summary>
             保护装置通信地址