1.中台母线关联

2.国网上送调整

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java

@@ -36,7 +36,7 @@ public class GeneratrixWireParam {
     @NotBlank(message = "电压等级不可为空")
     private String scale;
 
-
-
+    @ApiModelProperty(value = "关联中台的母线id",required = true)
+    private String midBusId;
 
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java

@@ -246,9 +246,12 @@ public class MonitorParam {
     @Data
     public static class Info implements Serializable {
         @ApiModelProperty(name = "monitorTag",value = "监测点对象标签")
-        @NotBlank(message = "监测点对象标签不可为空")
         private String monitorTag;
 
+        @ApiModelProperty(name = "objType",value = "监测点对象类型标签")
+        @NotBlank(message = "监测点对象类型不可为空")
+        private String objType;
+
         @ApiModelProperty(name = "ids",value = "id集合")
 //        @NotEmpty(message = "id集合不能为空")
         private List<String> ids;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java

@@ -43,10 +43,13 @@ public class GeneratrixWire extends BaseEntity {
     /**
      *  关联中台的母线id
      */
+    private String midBusId;
+
+    /**
+     *  关联中台的母线名称
+     */
     @TableField(exist = false)
-    private String relationId;
-
-
+    private String midBusName;
 
     @TableField(exist = false)
     private String orgId;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java

@@ -66,6 +66,10 @@ public class TractionStation extends BaseEntity {
      * 铁路线路名称
      */
     private String railwayLineName;
+    /**
+     * 铁路编号
+     */
+    private String railwayType;
 
     /**
      * 牵引站变压器接线方式(字典)

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

@@ -69,7 +69,6 @@ public class TractionStationDTO extends Unit {
     /*第二个监测点编号  是否必填：否*/
     @ExcelProperty(value = "第二个监测点编号")
     private String monitorNumberTwo;
-
     /*铁路id  是否必填：否*/
     @ExcelProperty(value = "铁路id")
     private String railwayId;