1.台账模块新增字段迁移微服务

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

@@ -117,6 +117,18 @@ public class DeviceParam {
     @ApiModelProperty(name = "sim",value = "装置sim卡号")
     private String sim;
 
+    @ApiModelProperty(name = "devSeries",value = "装置系列")
+    private String devSeries;
+
+    @ApiModelProperty(name = "devLocation",value = "监测装置安装位置")
+    private String devLocation;
+
+    @ApiModelProperty(name = "devNo",value = "监测厂家设备编号")
+    private String devNo;
+
+    @ApiModelProperty(name = "isAlarm",value = "告警功能 0:关闭  null、1:开启")
+    private Integer isAlarm;
+
     @ApiModelProperty(name = "sort",value = "排序",required = true)
     @NotNull(message = "排序不可为空")
     @Min(value = 0,message = "排序格式有误")

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

@@ -142,14 +142,12 @@ public class LineParam {
      * 电压上偏差限值
      */
     @ApiModelProperty(name = "voltageDev",value = "电压上偏差限值",required = true)
-    @NotNull(message = "电压上偏差限值不能为空")
     private Float voltageDev;
 
     /**
      * 电压下偏差限值
      */
     @ApiModelProperty(name = "uvoltageDev",value = "电压下偏差限值",required = true)
-    @NotNull(message = "电压下偏差限值不能为空")
     private Float uvoltageDev;
 
     @ApiModelProperty(name = "powerSubstationName",value = "电网侧变电站")
@@ -164,6 +162,9 @@ public class LineParam {
     @ApiModelProperty(name = "superiorsSubstation",value = "上级电站")
     private String superiorsSubstation;
 
+    @ApiModelProperty(name = "statFlag",value = "是否参与报告统计 0.不参与 1.参与")
+    private Integer statFlag;
+
     @ApiModelProperty(name = "hangLine",value = "挂接线路")
     private String hangLine;
 

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

@@ -1,6 +1,7 @@
 package com.njcn.device.pq.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -136,4 +137,28 @@ public class Device implements Serializable{
      */
     private String sim;
 
+
+    /**
+     * 装置系列
+     */
+    private String devSeries;
+
+
+    /**
+     * 监测装置安装位置
+     */
+    private String devLocation;
+
+
+    /**
+     * 监测厂家设备编号
+     */
+    private String devNo;
+
+
+    /**
+     * 告警功能 0:关闭  null、1:开启
+     */
+    private Integer isAlarm;
+
 }

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

@@ -125,6 +125,7 @@ public class LineDetail{
     private String remark;
 
 
+
     /**
      * 电网侧变电站
      */

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

@@ -109,6 +109,19 @@ public class DeviceVO implements Serializable {
     @ApiModelProperty(name = "sim",value = "装置sim卡")
     private String sim;
 
+    @ApiModelProperty(name = "devSeries",value = "装置系列")
+    private String devSeries;
+
+    @ApiModelProperty(name = "devLocation",value = "监测装置安装位置")
+    private String devLocation;
+
+    @ApiModelProperty(name = "devNo",value = "监测厂家设备编号")
+    private String devNo;
+
+    @ApiModelProperty(name = "isAlarm",value = "告警功能 0:关闭  null、1:开启")
+    private Integer isAlarm;
+
+
     @ApiModelProperty(name = "sort",value = "排序",required = true)
     private Integer sort;