辽宁功能提交

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

@@ -23,6 +23,7 @@ public enum LineBaseEnum {
     DEVICE_LEVEL(4, "设备"),
     SUB_V_LEVEL(5, "母线"),
     LINE_LEVEL(6, "监测点"),
+    USER_LEVEL(7,"用户"),
     INVALID_LEVEL(-1, "非法拓扑等级"),
 
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java

@@ -120,6 +120,15 @@ public class LineParam {
     @ApiModelProperty(name = "objName",value = "监测点对象名称")
     private String objName;
 
+    @ApiModelProperty(name = "objId",value = "对象id")
+    private String objId;
+
+    @ApiModelProperty(name = "bigObjType",value = "对象大类")
+    private String bigObjType;
+
+    @ApiModelProperty(name = "smallObjType",value = "对象小类")
+    private String smallObjType;
+
     /**
      * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
      */

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

@@ -107,8 +107,24 @@ public class LineDetail{
     /**
      * 监测点对象名称
      */
+    @Deprecated
     private String objName;
 
+    /**
+     * 监测点对象id
+     */
+    private String objId;
+
+    /**
+     * 监测对象大类
+     */
+    private String bigObjType;
+
+    /**
+     * 监测对象小类
+     */
+    private String smallObjType;
+
     /**
      * 人为干预 0 不参与统计 1 参与统计
      */
@@ -139,26 +155,31 @@ public class LineDetail{
     /**
      * 上级电站
      */
+    @Deprecated
     private String superiorsSubstation;
 
     /**
      * 挂接线路
      */
+    @Deprecated
     private String hangLine;
 
     /**
      * 监测点拥有者
      */
+    @Deprecated
     private String owner;
 
     /**
      * 拥有者职务
      */
+    @Deprecated
     private String ownerDuty;
 
     /**
      * 拥有者联系方式
      */
+    @Deprecated
     private String ownerTel;
 
     /**
@@ -183,6 +204,7 @@ public class LineDetail{
     /**
      * 新能源场站信息ID
      */
+    @Deprecated
     private String newStationId;
 
     /**

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

@@ -100,6 +100,21 @@ public class LineVO implements Serializable {
     @ApiModelProperty(name = "objName",value = "监测点对象名称")
     private String objName;
 
+    /**
+     * 监测点对象id
+     */
+    private String objId;
+
+    /**
+     * 监测对象大类
+     */
+    private String bigObjType;
+
+    /**
+     * 监测对象小类
+     */
+    private String smallObjType;
+
     /**
      * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
      */

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

@@ -75,4 +75,6 @@ public class TerminalTree implements Serializable {
      * 电网侧变电站
      */
     private String objName;
+
+    private String objId;
 }