kangwei ：对外大屏---需要统计瞬时 累计流量方;浊度

@@ -124,6 +124,34 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
         }else{
         }else{
             inVO.setPhVal("0");
             inVO.setPhVal("0");
         }
         }
+
+        if(monitorTagMap.get("JSLL")!=null){
+            if(dataMap.get(monitorTagMap.get("JSLL").toString())!=null){
+                inVO.setSsllVal(dataMap.get(monitorTagMap.get("JSLL").toString()).toString());
+            }else{
+                inVO.setSsllVal("0");
+            }
+        }else{
+            inVO.setSsllVal("0");
+        }
+        if(monitorTagMap.get("JSLJLL")!=null){
+            if(dataMap.get(monitorTagMap.get("JSLJLL").toString())!=null){
+                inVO.setLjllVal(dataMap.get(monitorTagMap.get("JSLJLL").toString()).toString());
+            }else{
+                inVO.setLjllVal("0");
+            }
+        }else{
+            inVO.setLjllVal("0");
+        }
+        if(monitorTagMap.get("JSSS")!=null){
+            if(dataMap.get(monitorTagMap.get("JSSS").toString())!=null){
+                inVO.setZdVal(dataMap.get(monitorTagMap.get("JSSS").toString()).toString());
+            }else{
+                inVO.setZdVal("0");
+            }
+        }else{
+            inVO.setZdVal("0");
+        }
         list.add(inVO);
         list.add(inVO);
         WaterQualityMonitoringDetailVO outVO = new WaterQualityMonitoringDetailVO();
         WaterQualityMonitoringDetailVO outVO = new WaterQualityMonitoringDetailVO();
         outVO.setParmType("out");
         outVO.setParmType("out");
@@ -184,6 +212,34 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
         }else{
         }else{
             outVO.setPhVal("0");
             outVO.setPhVal("0");
         }
         }
+
+        if(monitorTagMap.get("CSLL")!=null){
+            if(dataMap.get(monitorTagMap.get("CSLL").toString())!=null){
+                inVO.setSsllVal(dataMap.get(monitorTagMap.get("CSLL").toString()).toString());
+            }else{
+                inVO.setSsllVal("0");
+            }
+        }else{
+            inVO.setSsllVal("0");
+        }
+        if(monitorTagMap.get("CSLJLL")!=null){
+            if(dataMap.get(monitorTagMap.get("CSLJLL").toString())!=null){
+                inVO.setLjllVal(dataMap.get(monitorTagMap.get("CSLJLL").toString()).toString());
+            }else{
+                inVO.setLjllVal("0");
+            }
+        }else{
+            inVO.setLjllVal("0");
+        }
+        if(monitorTagMap.get("CSSS")!=null){
+            if(dataMap.get(monitorTagMap.get("CSSS").toString())!=null){
+                inVO.setZdVal(dataMap.get(monitorTagMap.get("CSSS").toString()).toString());
+            }else{
+                inVO.setZdVal("0");
+            }
+        }else{
+            inVO.setZdVal("0");
+        }
         list.add(outVO);
         list.add(outVO);
         return list;
         return list;
     }
     }

@@ -101,6 +101,17 @@ public class WaterQualityMonitoringDetailVO {
 	private String phUpper;
 	private String phUpper;
 	private String phLower;
 	private String phLower;
 	private String phAbnormal;
 	private String phAbnormal;
+
+	@ApiModelProperty(value = "浊度")
+	private String zdVal;
+
+	@ApiModelProperty(value = "瞬时流量")
+	private String ssllVal;
+	@ApiModelProperty(value = "累计流量")
+	private String ljllVal;
+
+
+
     /**
     /**
      * 摄像头
      * 摄像头
      */
      */