告警的传播

IoTSharp.Data/Alarm.cs

@@ -54,7 +54,7 @@ namespace IoTSharp.Data
         public ServerityLevel Serverity { get; set; }
 
         /// <summary>
-        /// 传播
+        /// 如果严重等级变化了， 那么就触发传播， 否则不触发传播， 传播意思就是执行规则链， 通过规则链往后传播状态
         /// </summary>
         public bool Propagate { get; set; }
 

IoTSharp/Extensions/AlarmExtension.cs

@@ -95,7 +95,28 @@ namespace IoTSharp.Extensions
                 {
                     var old = isone.First();
                     old.AlarmDetail = alarm.AlarmDetail;
-                    old.EndDateTime = DateTime.Now;
+                    if ( old.Serverity != dto.Serverity)
+                    {
+                        if (old.Serverity== ServerityLevel.Indeterminate && dto.Serverity!= ServerityLevel.Indeterminate)
+                        {
+                            old.StartDateTime = DateTime.Now;
+                            alarm.Propagate = true;
+                        }
+                        else if (old.Serverity != ServerityLevel.Indeterminate && dto.Serverity == ServerityLevel.Indeterminate)
+                        {
+                            old.EndDateTime = DateTime.Now;
+                            if (old.ClearDateTime.Year == 1970)
+                            {
+                                old.ClearDateTime = DateTime.Now;
+                            }
+                            alarm.Propagate = true;
+                        }
+                        else
+                        {
+                            alarm.Propagate = false;
+                        }
+                        old.Serverity = dto.Serverity;
+                    }
                 }
                 else
                 {

IoTSharp/Handlers/EventBusHandler.cs

@@ -136,7 +136,10 @@ namespace IoTSharp.Handlers
                         {
                             alarmDto.warnDataId = alm.Data.Id;
                             alarmDto.CreateDateTime = alm.Data.AckDateTime;
-                            await RunRules(alm.Data.OriginatorId, alarmDto, MountType.Alarm);
+                            if (alm.Data.Propagate)
+                            {
+                                await RunRules(alm.Data.OriginatorId, alarmDto, MountType.Alarm);
+                            }
                         }
                         else
                         {