终端台账数据同步

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java

@@ -222,5 +222,7 @@ public class SupervisionTempDeviceReportParam {
     @ApiModelProperty(value="合同号")
     private String contractNumber;
 
+    private String frontType;
+
 
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java

@@ -216,6 +216,16 @@ public class SupervisionTempLineReportParam {
     @ApiModelProperty(value="电压偏差下限")
     private Float voltageDeviationLowerLimit;
 
+    /**
+     * 线路号
+     */
+    private Integer num;
+
+    /**
+     * 线路号
+     */
+    private Integer ptType;
+
 
     @ApiModelProperty("发起人自选审批人 Map")
     private Map<String, List<String>> startUserSelectAssignees;

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportNormalParam.java

@@ -1,7 +1,5 @@
 package com.njcn.supervision.pojo.param.user;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -45,6 +43,11 @@ public class UserReportNormalParam extends BaseParam {
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
     private String status;
+    @ApiModelProperty(value="所属区域")
+    private String city;
+
+    @ApiModelProperty(value = "工程名称")
+    private String projectName;
 
 
     @ApiModelProperty("发起人自选审批人 Map")

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java

@@ -7,7 +7,6 @@ import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
 import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -141,6 +140,10 @@ public class UserReportParam extends BaseEntity {
         @ApiModelProperty(value="所属区域")
         private String city;
 
+        @ApiModelProperty(value = "工程名称")
+        private String projectName;
+
+
         @ApiModelProperty(value="数据来源类型 0：正常审核流程 1：批量导入")
         private Integer dataType;
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java

@@ -219,5 +219,8 @@ public class SupervisionTempDeviceReport {
     @TableField(value = "contract_number")
     private String contractNumber;
 
+    @TableField(value = "front_type")
+    private String frontType;
+
 
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineDebugPO.java

@@ -44,7 +44,7 @@ public class SupervisionTempLineDebugPO extends BaseEntity {
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
     @TableField(value = "`status`")
-    @ApiModelProperty(value="1:审批中；2：审批通过；3：审批不通过；4：已取消")
+    @ApiModelProperty(value="1:审批中；2：审批通过；3：审批不通过；4：已取消,5数据同步完成")
     private Integer status;
 
     /**

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java

@@ -137,6 +137,7 @@ public class SupervisionTempLineReport  extends BaseEntity {
     @TableField(value = "monitoring_terminal_code")
     private String monitoringTerminalCode;
 
+
     /**
      * 监测终端名称
      */
@@ -171,6 +172,17 @@ public class SupervisionTempLineReport  extends BaseEntity {
      */
     @TableField(value = "is_statistical")
     private String isStatistical;
+    /**
+     * 线路号
+     */
+    @TableField(value = "num")
+    private Integer num;
+
+    /**
+     * 线路号
+     */
+    @TableField(value = "pt_type")
+    private Integer ptType ;
 
     /**
      * 监测点对象名称