pms国网上送代码提交

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/MonitorLimitDTO.java

@@ -17,6 +17,12 @@ import java.util.Date;
 public class MonitorLimitDTO {
 
 
+    private String monitorName;
+
+    private String orgName;
+
+    private String orgId;
+
     private String id;
     private Date ocDate;
     private String monitorId;
@@ -90,4 +96,6 @@ public class MonitorLimitDTO {
     private BigDecimal i48Limit;
     private BigDecimal i49Limit;
     private BigDecimal i50Limit;
+
+    private Integer monitorUploadStatus;
 }

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

@@ -240,7 +240,6 @@ public class MonitorParam {
     private String fieldStation;
 
     @ApiModelProperty(value = "行业分类")
-    @NotBlank(message = "行业分类不能为空")
     private String tradeCode;
 
     @Data

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

@@ -25,4 +25,8 @@ public class TerminalQueryParam extends BaseParam {
     @ApiModelProperty(value = "监测点标签(字典)")
     private String monitorTag;
 
+    @ApiModelProperty(value = "监测对象类型")
+    private String objType;
+
+
 }

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

@@ -38,6 +38,10 @@ public class GeneratrixWire extends BaseEntity {
      */
     private String generatrixName;
 
+    /**
+     * 中台母线id
+     */
+
     private Integer status;
 
     /**

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

@@ -230,10 +230,15 @@ public class Monitor extends BaseEntity {
      */
     private String tradeCode;
     /**
-     * 0.未上送 1.已上送 2.取消上送 3.待重新上送
+     * 0.未上送 1.已上送 2.取消上送 3.待重新上送(用于典型负荷)
      */
     private Integer isUploadHead;
 
+    /**
+     * 0.未上送 1.已上送 2.取消上送 3.待重新上送(用于主网监测点)
+     */
+    private Integer monitorUploadStatus;
+
 
     /**
      * 牵引站id