代码合并终

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/OverviewVO.java

@@ -17,19 +17,74 @@ import java.util.List;
 public class OverviewVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(name = "monitorSort", value = "监测点类别")
-    private String monitorSort;
-    @ApiModelProperty(name = "sumNum", value = "监测点数量")
-    private String sumNum;
-    @ApiModelProperty(name = "ytbSumNum", value = "同比监测点数量")
-    private String ytbSumNum;
-    @ApiModelProperty(name = "yhbSumNum", value = "环比监测点数量")
-    private String yhbSumNum;
-    @ApiModelProperty(name = "sumNum", value = "同比监测点占比")
-    private String sameNum;
-    @ApiModelProperty(name = "sumNum", value = "环比监测点占比")
-    private String ringNum;
+    @ApiModelProperty(name = "monitorObjects", value = "监测点集合")
+    private List<MonitorObject> monitorObjects;
 
+    @ApiModelProperty(name = "setRate", value = "光伏用户")
+    private PhotovoltaicUser photovoltaicUser;
+
+    @ApiModelProperty(name = "setRate", value = "光伏容量")
+    private PhotovoltaicCapacity photovoltaicCapacity;
+
+    @Data
+    public static class MonitorObject {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+        private String monitorSort;
+        @ApiModelProperty(name = "sumNum", value = "监测点数量")
+        private String sumNum;
+        @ApiModelProperty(name = "ytbSumNum", value = "同比监测点数量")
+        private String ytbSumNum;
+        @ApiModelProperty(name = "yhbSumNum", value = "环比监测点数量")
+        private String yhbSumNum;
+        @ApiModelProperty(name = "sumNum", value = "同比监测点占比")
+        private String sameNum;
+        @ApiModelProperty(name = "sumNum", value = "环比监测点占比")
+        private String ringNum;
+        @ApiModelProperty(name = "setRate", value = "设置率")
+        private String setRate="20.3";
+
+    }
+
+    @Data
+    public static class PhotovoltaicUser {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "highPressure", value = "中压用户(10KV)")
+        private Integer highPressure=0;
+
+        @ApiModelProperty(name = "highPressure", value = "低压用户(380V)")
+        private Integer lowPressure=0;
+
+    }
+
+    @Data
+    public static class PhotovoltaicCapacity {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "highCapacity", value = "中压容量(10KV)")
+        private Float highCapacity=0.f;
+
+        @ApiModelProperty(name = "lowCapacity", value = "低压容量(380V)")
+        private Float lowCapacity=0.f;
+
+    }
+
+    @Data
+    public static class PhotoVoltaicVoltage {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "type", value = "电压类型")
+        private String type;
+
+        @ApiModelProperty(name = "num", value = "数量")
+        private Integer num;
+
+        @ApiModelProperty(name = "capacity", value = "容量")
+        private Float capacity;
+
+    }
     @Data
     public static class AlarmVO {
         private static final long serialVersionUID = 1L;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java

@@ -54,7 +54,7 @@ public class SpecialAnalysisMonitorVO implements Serializable {
         private String name;
 
         /**
-         * 监测点名称
+         * 单位名称
          */
         @ApiModelProperty(name = "orgName", value = "单位名称")
         private String orgName;