Browse Source

alarm 清除后 同步清楚EAP端报警

jiangjy 1 week ago
parent
commit
75a8641848
1 changed files with 8 additions and 8 deletions
  1. 8 8
      Furnace/FurnaceRT/Equipments/Systems/EquipmentManager.cs

+ 8 - 8
Furnace/FurnaceRT/Equipments/Systems/EquipmentManager.cs

@@ -448,12 +448,12 @@ namespace FurnaceRT.Equipments.Systems
             GetXmlElement("DeviceModelPM", key, ref result);
             return result;
         }
-        Dictionary<string,List<string>>  GetALLDeviceKeyDict()
-        {      
+        Dictionary<string, List<string>> GetALLDeviceKeyDict()
+        {
             return GetXmlElement("DeviceModelPM");
         }
 
-        public void GetXmlElement(string fileName,string type, ref List<string> result, bool isSystem = false)
+        public void GetXmlElement(string fileName, string type, ref List<string> result, bool isSystem = false)
         {
             result = new List<string>();
             XmlDocument xmlDoc = new XmlDocument();
@@ -469,7 +469,7 @@ namespace FurnaceRT.Equipments.Systems
                 var classType = element.GetAttribute("classType");
                 if (classType == null) continue;
                 classType = classType.Split('.').LastOrDefault();
-                if (classType ==type)
+                if (classType == type)
                 {
                     foreach (XmlNode children in item.ChildNodes)
                     {
@@ -483,7 +483,7 @@ namespace FurnaceRT.Equipments.Systems
                 }
             }
         }
-        public Dictionary<string,List<string>> GetXmlElement(string fileName, bool isSystem = false)
+        public Dictionary<string, List<string>> GetXmlElement(string fileName, bool isSystem = false)
         {
             Dictionary<string, List<string>> result = new Dictionary<string, List<string>>();
             XmlDocument xmlDoc = new XmlDocument();
@@ -947,7 +947,7 @@ namespace FurnaceRT.Equipments.Systems
             EV.ClearAlarmEvent();
 
             Singleton<DeviceEntity>.Instance.PostMsg(DeviceEntity.MSG.RESET);
-
+            Singleton<FAHost>.Instance.ClearAlarm();
             IoProviderManager.Instance.Reset();
 
             foreach (var modulesValue in Modules.Values)
@@ -1549,12 +1549,12 @@ namespace FurnaceRT.Equipments.Systems
 
             if (args.Length > 2)
             {
-                if (args.Length >3)
+                if (args.Length > 3)
                 {
                     isCheckType = bool.Parse(args[3].ToString());
                 }
                 var inputType = args[2].ToString();
-                if (!carrierTye.ToString().Equals(CarrierType.None.ToString()) && !carrierTye.ToString().Equals(inputType)&& isCheckType)
+                if (!carrierTye.ToString().Equals(CarrierType.None.ToString()) && !carrierTye.ToString().Equals(inputType) && isCheckType)
                 {
                     EV.PostInfoLog(Module, $"{chamber} type mismatch!");
                     return false;