设备监控右侧新增:趋势数据、实时数据、暂态事件相关接口

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CommonStatisticalQueryParam.java

@@ -20,7 +20,6 @@ public class CommonStatisticalQueryParam {
     @ApiModelProperty(value = "设备id")
     private String DevId;
     @ApiModelProperty(value = "指标组id")
-    @NotBlank(message="指标组id不能为空")
     private String statisticalId;
     @ApiModelProperty(value = "取值类型（Max，Min，cp95，avg）")
     private String valueType;
@@ -35,9 +34,16 @@ public class CommonStatisticalQueryParam {
 
     private String process;
 
-
-
-
-
+    @ApiModelProperty(value = "用于选择多个指标及谐波次数")
+    List<CommonStatisticalQueryParam> list;
+    //用于暂态事件列表分页
+    @ApiModelProperty(value = "多个谐波次数")
+    private List<String> frequencys;
+    private int pageNum;
+    private int pageSize;
+    @ApiModelProperty(value = "查询分类:传1 则是趋势数据tab页面,传2 则是实时数据tab页面,传3 则是暂态事件tab页面")
+    private String type;
+    @ApiModelProperty(value = "监测点")
+    private String lineId;
 
 }

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ThdDataVO.java

@@ -30,7 +30,7 @@ public class ThdDataVO {
     private String unit;
     private String anotherName;
 
-
+    private String frequency;
     private Double statisticalData;