1.全景展示修改，调整监测基本信息展示

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java

@@ -1,7 +1,7 @@
 package com.njcn.device.pq.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -180,4 +180,9 @@ public class LineDetail{
      */
     private Integer runFlag;
 
+    /**
+     * 通讯状态
+     */
+    @TableField(exist = false)
+    private Integer comFlag;
 }

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

@@ -0,0 +1,41 @@
+package com.njcn.device.pq.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wr
+ * @description
+ * @date 2024/6/3 13:52
+ */
+@Data
+public class GridDiagramProVO {
+
+    @ApiModelProperty(name = "num", value = "冀北公司")
+    private List<Details> data;
+
+
+    @ApiModelProperty(name = "num", value = "报送国网")
+    private List<Details> gwData;
+
+    @Data
+    public static class Details {
+        @ApiModelProperty(name = "num", value = "监测点个数")
+        private Integer num;
+
+        @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 = "integrityRate", value = "数据完整率")
+        private Float integrityRate;
+    }
+
+}

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

@@ -182,4 +182,20 @@ public class GridDiagramVO {
         private Integer onDevice;
 
     }
+    @Data
+    public static class RunData {
+        // 合格/告警     在线/离线     数据完整性≥90% / <90%    电能质量指标未超标/超标
+        @ApiModelProperty(name = "lineNumOne", value = "监测点个数")
+        private Integer lineNumOne;
+
+        @ApiModelProperty(name = "lineListOne", value = "监测点集合")
+        private List<String> lineListOne;
+
+        @ApiModelProperty(name = "lineNumTwo", value = "监测点个数")
+        private Integer lineNumTwo;
+
+        @ApiModelProperty(name = "lineListTwo", value = "监测点集合")
+        private List<String> lineListTwo;
+
+    }
 }