1.冀北台账树编写

2.技术监督删除流程业务调整，支持多数据删除

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

@@ -32,9 +32,13 @@ public enum LineBaseEnum {
      */
     PV_UNIT_LEVEL(0,"单位"),
     PV_SUB_LEVEL(1,"变电站"),
-    PV_SUB_AREA_LEVEL(2,"台区")
-
+    PV_SUB_AREA_LEVEL(2,"台区"),
 
+    /**
+     * 电网标志
+     */
+    POWER_FLAG(0,"电网侧"),
+    POWER_FLAG_NOT(1,"非电网侧")
 
     ;
 

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

@@ -115,4 +115,7 @@ public class AreaLineInfoVO implements Serializable {
 
     @ApiModelProperty(name = "type",value = "冀北电网一张图类型信息")
     private Integer type;
+
+    @ApiModelProperty(name = "新能源场站信息ID")
+    private String newStationId;
 }

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

@@ -124,4 +124,27 @@ public class LineVO implements Serializable {
     @ApiModelProperty(name = "newStationId",value = "新能源场站信息ID")
     private String newStationId;
 
+    /**
+     * 电网侧变电站
+     */
+    @ApiModelProperty(name = "powerSubstationName",value = "电网侧变电站")
+    private String powerSubstationName;
+
+    /**
+     * 监测点拥有者
+     */
+    @ApiModelProperty(name = "owner",value = "监测点拥有者")
+    private String owner;
+
+    /**
+     * 拥有者职务
+     */
+    @ApiModelProperty(name = "ownerDuty",value = "拥有者职务")
+    private String ownerDuty;
+
+    /**
+     * 上级电站
+     */
+    @ApiModelProperty(name = "superiorsSubstation",value = "上级电站")
+    private String superiorsSubstation;
 }

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

@@ -35,6 +35,7 @@ public class TerminalTree implements Serializable {
     private Integer sort;
     @ApiModelProperty(name = "comFlag",value = "设备状态")
     private Integer comFlag;
+
     @ApiModelProperty(name = "children",value = "子节点")
     private List<TerminalTree> children = new ArrayList<>();
 
@@ -59,4 +60,14 @@ public class TerminalTree implements Serializable {
      * 接线方式
      */
     private Integer ptType;
+
+    /**
+     * 电网标志（0-电网侧；1-非电网侧）
+     */
+    private Integer powerFlag;
+
+    /**
+     * 电网侧变电站
+     */
+    private String powerSubstationName;
 }