Merge remote-tracking branch 'origin/master'

@@ -255,8 +255,8 @@
 			sys_monitor_metric_info m
 			sys_monitor_metric_info m
 		WHERE
 		WHERE
 			m.metric_uid_tag IN (
 			m.metric_uid_tag IN (
-			'CSAD','CSCOD','CSLJLL','CSLL','CSPH','CSSS','CSTN','CSZL',
-			'JSAD','JSCOD','JSLJLL','JSLL','JSPH','JSSS','JSZD','JSZL'
+			'CSNH3N','CSCOD','CSLJLL','CSLL','CSPH','CSSS','CSTN','CSTP',
+			'JSNH3N','JSCOD','JSLJLL','JSLL','JSPH','JSSS','JSTN','JSTP'
 			)
 			)
 	</select>
 	</select>
 </mapper>
 </mapper>

@@ -2,6 +2,7 @@ package com.skua.modules.dataAnalysis.controller;
 
 
 import com.skua.core.api.vo.Result;
 import com.skua.core.api.vo.Result;
 import com.skua.core.context.BaseContextHandler;
 import com.skua.core.context.BaseContextHandler;
+import com.skua.core.util.ConvertUtils;
 import com.skua.modules.common.service.ICommonSqlService;
 import com.skua.modules.common.service.ICommonSqlService;
 import com.skua.modules.dataAnalysis.service.IFactoryCenterService;
 import com.skua.modules.dataAnalysis.service.IFactoryCenterService;
 import com.skua.modules.dataAnalysis.vo.StatisticsParam;
 import com.skua.modules.dataAnalysis.vo.StatisticsParam;
@@ -194,7 +195,7 @@ public class FactoryCenterController {
         List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
         List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
         WaterQualityMonitoringVO res = new WaterQualityMonitoringVO();
         WaterQualityMonitoringVO res = new WaterQualityMonitoringVO();
         String departIds = "";
         String departIds = "";
-        if(waterQualityParams.getDepartId()!=null){
+        if(ConvertUtils.isNotEmpty(waterQualityParams.getDepartId())){
             departIds = commonSqlService.getChildFactorys(waterQualityParams.getDepartId());
             departIds = commonSqlService.getChildFactorys(waterQualityParams.getDepartId());
         }else{
         }else{
             departIds = commonSqlService.getChildFactorys(BaseContextHandler.getRealDepartId());
             departIds = commonSqlService.getChildFactorys(BaseContextHandler.getRealDepartId());

@@ -20,4 +20,14 @@ public class StatisticsParam {
 	/**结束时间*/
 	/**结束时间*/
 	@ApiModelProperty(value = "结束时间")
 	@ApiModelProperty(value = "结束时间")
 	private String endDate;
 	private String endDate;
+	/**进出水类型*/
+	@ApiModelProperty(value = "进出水类型")
+	private String parmType;
+	/**数据类型*/
+	@ApiModelProperty(value = "数据类型")
+	private String statics;
+	/**数据标签*/
+	@ApiModelProperty(value = "数据标签")
+	private String tag;
+
 }
 }

@@ -42,11 +42,11 @@ public class WaterQualityMonitoringDetailVO {
 	@ApiModelProperty(value = "监测时间")
 	@ApiModelProperty(value = "监测时间")
     private String monitorTime;
     private String monitorTime;
 
 
-//	@ApiModelProperty(value = "流量")
-//  private String flowVal;
-//	private String flowUpper;
-//	private String flowLower;
-//	private String flowAbnormal;
+	@ApiModelProperty(value = "流量")
+  	private String flowVal;
+	private String flowUpper;
+	private String flowLower;
+	private String flowAbnormal;
 
 
 	@ApiModelProperty(value = "cod")
 	@ApiModelProperty(value = "cod")
     private String codVal;
     private String codVal;
@@ -90,8 +90,8 @@ public class WaterQualityMonitoringDetailVO {
 	@ApiModelProperty(value = "浊度")
 	@ApiModelProperty(value = "浊度")
 	private String zdVal;
 	private String zdVal;
 
 
-	@ApiModelProperty(value = "瞬时流量")
-	private String ssllVal;
+//	@ApiModelProperty(value = "瞬时流量")
+//	private String ssllVal;
 	@ApiModelProperty(value = "累计流量")
 	@ApiModelProperty(value = "累计流量")
 	private String ljllVal;
 	private String ljllVal;
 
 

@@ -19,4 +19,8 @@ public class WaterQualityParams {
     @ApiModelProperty(value = "进出水类型")
     @ApiModelProperty(value = "进出水类型")
     private String parmType;
     private String parmType;
 
 
+    //数据类型
+    @ApiModelProperty(value = "数据类型  all/access/online/normal/abnormal")
+    private String dataType;
+
 }
 }