设备监控代码更新

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -1265,7 +1265,7 @@ namespace IMCS.CCS.Service.Impl
                 foreach (EquipmentMonitor equipment in equipmentMonitors)
                 {
                     Device device = devices.Where(x => x.Ip.Equals(equipment.IP)).FirstOrDefault();
-                    if (device == null && !device.State)
+                    if (device != null && !device.State)
                     {
                         if (equipment.Status != "掉线")
                         {
@@ -1275,7 +1275,7 @@ namespace IMCS.CCS.Service.Impl
 
                         continue;
                     }
-                    else if (device == null && equipment.Name == "机械手")
+                    else if (device != null && equipment.Name == "机械手")
                     {
                         CcsTagValue ccsTagValue = tagValues.Where(x => x.Ip.Equals(equipment.IP) && x.Address.Equals(equipment.Address)).FirstOrDefault();
                         if (ccsTagValue != null)
@@ -1382,7 +1382,7 @@ namespace IMCS.CCS.Service.Impl
                         else
                         {
                             //获取机械手报警信息
-                            CcsTagValue plcWarnValue = tagValues.Where(x => x.Ip.Equals(changeEquipment.IP) && x.Address.Equals("DB200.34")).FirstOrDefault();
+                            CcsTagValue plcWarnValue = tagValues.Where(x => x.Ip ==changeEquipment.IP  && x.Address =="DB200.34").FirstOrDefault();
                             if (plcWarnValue != null)
                             {
                                 ToolDto ccsDictionary = new ToolDto();