添加统计类型监测点性质

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/PowerFlagEnum.java

@@ -0,0 +1,43 @@
+package com.njcn.device.pq.enums;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/1/4
+ */
+@Getter
+public enum PowerFlagEnum {
+
+    /**
+     * 系统拓扑各层级描述
+     */
+    GRID_SIDE(0, "电网侧"),
+    NO_GRID_SIDE(1, "非电网侧"),
+    NEW_ENERGY(2, "电网侧(新能源)"),
+    NO_NEW_ENERGY(3, "非电网侧(新能源)"),
+    SEND_NETWORK(4, "上送国网"),
+    PCC(5, "PCC");
+
+
+
+    private final Integer code;
+    private final String message;
+
+    PowerFlagEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static PowerFlagEnum getPowerFlagEnumByCode(Integer code) {
+        return Arrays.stream(PowerFlagEnum.values())
+                .filter(x -> x.getCode().equals(code))
+                .findAny()
+                .orElse(GRID_SIDE);
+    }
+
+}

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

@@ -1,6 +1,5 @@
 package com.njcn.device.pq.pojo.vo;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -21,6 +20,11 @@ public class GridDiagramVO {
     @ApiModelProperty(name = "gwInfo", value = "国网监测点信息信息")
     private List<?> gwInfo;
 
+    @ApiModelProperty(name = "data", value = "总信息")
+    private Double data;
+
+    @ApiModelProperty(name = "gwData", value = "国网总信息")
+    private Double gwData;
     @Data
     public static class LineStatistics {
         @ApiModelProperty(name = "orgId", value = "单位id")
@@ -29,6 +33,9 @@ public class GridDiagramVO {
         @ApiModelProperty(name = "orgName", value = "单位名称")
         private String orgName;
 
+        @ApiModelProperty(name = "count", value = "次数")
+        private Long count;
+
         @ApiModelProperty(name = "data", value = "数据")
         private List<?> data;
     }

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

@@ -73,10 +73,9 @@ public class HalfReportVO implements Serializable {
     @ApiModelProperty("使用流量(M)")
     private BigDecimal statisValue;
 
-    //    @ApiModelProperty("剩余流量(M)")
-//    private BigDecimal ;
-//    @ApiModelProperty("使用率(%)")
-//    private BigDecimal ;
+    @ApiModelProperty("干扰源类型")
+    private String loadType;
+
     @ApiModelProperty("ICICD")
     private String sim;