无报警不推送

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -1398,7 +1398,7 @@ namespace IMCS.CCS.Service.Impl
                         if (Result.IsSuccess)
                         { 
                             ResponseHeidhData responseData = JsonConvert.DeserializeObject<ResponseHeidhData>(Result.Message);
-                            if (!string.IsNullOrEmpty(responseData.errorsInfo))
+                            if (!string.IsNullOrEmpty(responseData.errorsInfo) && !responseData.errorsInfo.Contains("无报警"))
                             {
                                 ProductionStatus productionStatus = new ProductionStatus();
                                 productionStatus.id = alarmEquipment.Id.ToString();
@@ -1421,12 +1421,16 @@ namespace IMCS.CCS.Service.Impl
                             //List<AlmInfo> AlmMsg = fncReq.AlmMsg;                                   
                             if (AlmMsg != null && AlmMsg.Count > 0)
                             {
-                                ProductionStatus productionStatus = new ProductionStatus();
-                                productionStatus.id = alarmEquipment.Id.ToString();
                                 var msgs = from o in AlmMsg select o.msg;
-                                productionStatus.alertMsg = string.Join(",", msgs.ToArray());
-                                productionStatus.alarmState = true;//报警
-                                productionStatusList.Add(productionStatus);
+                                if(msgs != null && !msgs.ToString().Contains("无报警"))
+                                {
+                                    ProductionStatus productionStatus = new ProductionStatus();
+                                    productionStatus.id = alarmEquipment.Id.ToString();
+                                    productionStatus.alertMsg = string.Join(",", msgs.ToArray());
+                                    productionStatus.alarmState = true;//报警
+                                    productionStatusList.Add(productionStatus);
+                                }
+                                
                             }
                         }