1.冀北电网一张图-暂态水平调整

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

@@ -21,10 +21,10 @@ public class GridDiagramVO {
     private List<?> gwInfo;
 
     @ApiModelProperty(name = "data", value = "总信息")
-    private Double data;
+    private List<Double> data;
 
     @ApiModelProperty(name = "gwData", value = "国网总信息")
-    private Double gwData;
+    private List<Double> gwData;
     @Data
     public static class LineStatistics {
         @ApiModelProperty(name = "orgId", value = "单位id")
@@ -138,4 +138,32 @@ public class GridDiagramVO {
         @ApiModelProperty(name = "onLineRate", value = "数据在线率")
         private Float onLineRate;
     }
+
+    @Data
+    public static class AreaData {
+
+        @ApiModelProperty(name = "orgId", value = "单位id")
+        private String orgId;
+
+        @ApiModelProperty(name = "orgName", value = "单位名称")
+        private String orgName;
+
+        @ApiModelProperty(name = "lineNum", value = "监测点个数")
+        private Integer lineNum;
+
+        @ApiModelProperty(name = "lineList", value = "监测点集合")
+        private List<String> lineList;
+
+        @ApiModelProperty(name = "alarm", value = "告警监测点个数")
+        private Integer alarm;
+
+        @ApiModelProperty(name = "onLineNumList", value = "告警监测点信息")
+        private List<String> alarmList;
+
+        @ApiModelProperty(name = "subNum", value = "变电站个数")
+        private Integer subNum;
+
+        @ApiModelProperty(name = "deviceNum", value = "终端个数")
+        private Integer deviceNum;
+    }
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml

@@ -110,6 +110,7 @@
         inner join pq_substation sub on sub.id = substation.id
         where device.Dev_Model = 1
         and point.state = 1
+        and device.Run_Flag = 0
         and device.Dev_Data_Type in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}