Merge remote-tracking branch 'origin/master'

@@ -126,7 +126,6 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
                 list.addAll(realTimelist);
                 list.addAll(realTimelist);
             }
             }
         }
         }
-
         return list;
         return list;
     }
     }
 
 
@@ -401,6 +400,14 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
                     waterQualityMonitoringDetailVO.setPhMessage("低于下限："+waterQualityMonitoringDetailVO.getPhLower());
                     waterQualityMonitoringDetailVO.setPhMessage("低于下限："+waterQualityMonitoringDetailVO.getPhLower());
                 }
                 }
             }
             }
+        }else{
+            if("no".equals(waterQualityMonitoringDetailVO.getPhVal())){
+                waterQualityMonitoringDetailVO.setPhAbnormal("未接入");
+            }else if("off".equals(waterQualityMonitoringDetailVO.getPhVal())){
+                waterQualityMonitoringDetailVO.setPhAbnormal("离线");
+            }else{
+                waterQualityMonitoringDetailVO.setPhAbnormal("0");
+            }
         }
         }
         if("no".equals(waterQualityMonitoringDetailVO.getFlowVal())){
         if("no".equals(waterQualityMonitoringDetailVO.getFlowVal())){
             waterQualityMonitoringDetailVO.setFlowAbnormal("未接入");
             waterQualityMonitoringDetailVO.setFlowAbnormal("未接入");