1.冀北电网一张图-变电站统计电网侧统计

2.公共方法增加点电网侧信息
3.修改区域监测点终端等信息接口

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

@@ -154,6 +154,12 @@ public class GridDiagramVO {
         @ApiModelProperty(name = "lineList", value = "监测点集合")
         private List<String> lineList;
 
+        @ApiModelProperty(name = "onlineNum", value = "在线监测点个数")
+        private Integer onlineNum;
+
+        @ApiModelProperty(name = "onlineList", value = "在线监测点集合")
+        private List<String> onlineList;
+
         @ApiModelProperty(name = "alarm", value = "告警监测点个数")
         private Integer alarm;
 
@@ -163,7 +169,17 @@ public class GridDiagramVO {
         @ApiModelProperty(name = "subNum", value = "变电站个数")
         private Integer subNum;
 
+        @ApiModelProperty(name = "alarmSubNum", value = "告警变电站数量")
+        private Integer alarmSubNum;
+
+        @ApiModelProperty(name = "alarmSubList", value = "告警变电站监测点数量")
+        private List<String> alarmSubList;
+
         @ApiModelProperty(name = "deviceNum", value = "终端个数")
         private Integer deviceNum;
+
+        @ApiModelProperty(name = "onDevice", value = "在线终端数量")
+        private Integer onDevice;
+
     }
 }