林豪 左 преди 2 години
родител
ревизия
55d9d88988
променени са 1 файла, в които са добавени 44 реда и са изтрити 0 реда
  1. 44 0
      WCS.WorkEngineering/Systems/DataCollectionSysyem.cs

+ 44 - 0
WCS.WorkEngineering/Systems/DataCollectionSysyem.cs

@@ -76,6 +76,7 @@ namespace WCS.Service.Systems
                         dev.D81 = TypeExtension.Mapper<WCS_BCR81, IBCR81>(d81.Data);
                     }
                     RedisHub.WMS.Set(item.Entity.Code, item.Data2.Mode);
+                    RedisHub.WMS.Set($"{nameof(EquipmentAlarm)}:{item.Entity.Code}", item.Data3.Alarm);
 
                     DevList.Add(dev);
                 }
@@ -93,6 +94,7 @@ namespace WCS.Service.Systems
                         D537 = TypeExtension.Mapper<WCS_SRM537, ISRM537>(item.Data3),
                     };
                     RedisHub.WMS.Set(item.Entity.Code, item.Data2.AutoStatus);
+                    RedisHub.WMS.Set($"{nameof(EquipmentAlarm)}:{item.Entity.Code}", item.Data3.Alarm);
                     srmList.Add(dev);
                 }
                 pack.SRMDatas = new DeviceDataCollection<SRMData>(DateTime.Now, srmList.ToArray());
@@ -115,4 +117,46 @@ namespace WCS.Service.Systems
             });
         }
     }
+
+    /// <summary>
+    ///  设备报警
+    /// </summary>
+    public class EquipmentAlarm
+    {
+        /// <summary>
+        ///  设备号
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        ///  内容
+        /// </summary>
+        public string Msg { get; set; }
+
+        /// <summary>
+        ///  时间
+        /// </summary>
+        public DateTime Time { get; set; }
+    }
+
+    /// <summary>
+    ///  业务报警
+    /// </summary>
+    public class BusinessAlarm
+    {
+        /// <summary>
+        ///  设备号
+        /// </summary>
+        public string BusinessName { get; set; }
+
+        /// <summary>
+        ///  内容
+        /// </summary>
+        public string Pos { get; set; }
+
+        /// <summary>
+        ///  时间
+        /// </summary>
+        public DateTime Time { get; set; }
+    }
 }