1.冀北电网一张图,变电站，终端，监测点接口，添加监测点id信息

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java

@@ -178,4 +178,18 @@ public class DeviceInfoParam implements Serializable {
 
     }
 
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class GridDiagram extends BusinessParam{
+
+        @ApiModelProperty("查询总数监测点")
+        private List<String> coutList;
+
+        @ApiModelProperty("查询告警监测点")
+        private List<String> alarmList;
+
+        @ApiModelProperty("是否是冀北电网一张图树 0:否 1:是")
+        private Integer type;
+    }
+
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java

@@ -112,4 +112,7 @@ public class AreaLineInfoVO implements Serializable {
 
     @ApiModelProperty(name = "tail",value = "总数")
     private Integer tail;
+
+    @ApiModelProperty(name = "type",value = "冀北电网一张图类型信息")
+    private Integer type;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/GridDiagramVO.java

@@ -46,9 +46,15 @@ public class GridDiagramVO {
         @ApiModelProperty(name = "num", value = "监测点个数")
         private Integer num;
 
-        @ApiModelProperty(name = "num", value = "在线监测点数")
+        @ApiModelProperty(name = "numList", value = "监测点集合")
+        private List<String> numList;
+
+        @ApiModelProperty(name = "onLineNum", value = "在线监测点数")
         private Integer onLineNum;
 
+        @ApiModelProperty(name = "onLineNumList", value = "在线监测点集合")
+        private List<String> onLineNumList;
+
         @ApiModelProperty(name = "onLineRate", value = "数据在线率")
         private Float onLineRate;
 
@@ -62,9 +68,14 @@ public class GridDiagramVO {
         @ApiModelProperty(name = "numOne", value = "数据")
         private Long numOne;
 
+        @ApiModelProperty(name = "numOneList", value = "数据集合")
+        private List<String> numOneList;
+
         @ApiModelProperty(name = "numTwo", value = "数据")
         private Long numTwo;
 
+        @ApiModelProperty(name = "numTwoList", value = "数据集合")
+        private List<String> numTwoList;
     }
     @Data
     public static class DeviceData {