fix add minics报警触发

FrameworkLocal/Common/Event/AlarmEventItem.cs

@@ -107,18 +107,13 @@ namespace MECF.Framework.Common.Event
                     EV.ClearAlarmEvent(this.EventEnum);
                 }
             }
-            if (this.EventEnum!=null)
+            if (this.EventEnum != null)
             {
-                var isBoatZAxisMoveFailedForInterlockAlarm = this.EventEnum.EndsWith("BoatZAxisMoveFailedForInterlock");
-                if (!string.IsNullOrEmpty(error) && !isBoatZAxisMoveFailedForInterlockAlarm)
-                {
-
-                    Description = error;
-                    AdditionalDescription = error;
-                }
+                Description = error;
+                AdditionalDescription = error;
             }
 
-       
+
 
             IsAcknowledged = false;
 

FrameworkLocal/Common/Event/EV.cs

@@ -81,7 +81,7 @@ namespace Aitex.Core.RT.Event
         public static List<EventItem> GetAlarmEvent()
         {
             if (InnerEventManager != null)
-                return InnerEventManager.GetAlarmEvent().OrderByDescending(p=>p.Level).ToList();
+                return InnerEventManager.GetAlarmEvent().Where(a => a != null).OrderByDescending(p => p.Level).ToList();
             return null;
         }
 

Furnace/FurnaceRT/Extraction/MinicsManager.cs

@@ -106,17 +106,17 @@ namespace FurnaceRT.Extraction
             var alarmValue = MinicsAlarmDic[gasLineHeaterIndex];
             if (alarm.AlarmType == RTCommunicatorBase.AlarmType.CapsOverFlow)
             {
-                var msg = $"{gasLineHeaterIndex} {alarm.PV} limit is ({alarm.Caps}~{alarm.Floor}) ";
+                var msg = $"Unit{alarm.Mini8Index}CH{alarm.ChannelIndex} Feedback:{alarm.PV} limit is ({alarm.Caps}~{alarm.Floor}) ";
                 alarmValue.Item1.Set(msg);
             }
             if (alarm.AlarmType == RTCommunicatorBase.AlarmType.FloorOverFlow)
             {
-                var msg = $"{gasLineHeaterIndex} {alarm.PV} limit is ({alarm.Caps}~{alarm.Floor}) ";
+                var msg = $"Unit{alarm.Mini8Index}CH{alarm.ChannelIndex} Feedback:{alarm.PV} limit is ({alarm.Caps}~{alarm.Floor}) ";
                 alarmValue.Item2.Set(msg);
             }
             if (alarm.AlarmType == RTCommunicatorBase.AlarmType.TcBroken)
             {
-                var msg = $"{gasLineHeaterIndex} is TcBroken";
+                var msg = $"Unit{alarm.Mini8Index}CH{alarm.ChannelIndex} is TcBroken";
                 alarmValue.Item3.Set(msg);
             }
         }