终端模块新增对外接口

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

@@ -30,11 +30,11 @@ public class DeviceInfoParam implements Serializable {
     /**
      * 统计类型
      */
-    @ApiModelProperty(name = "statisticalType", value = "统计类型")
+    @ApiModelProperty(name = "statisticalType", value = "统计类型",required = true)
     @NotNull(message = "统计类型不可为空")
     private SimpleDTO statisticalType;
 
-    @ApiModelProperty(name = "deptIndex", value = "部门索引")
+    @ApiModelProperty(name = "deptIndex", value = "部门索引",required = true)
     @NotBlank(message = "部门索引不可为空")
     private String deptIndex;
 
@@ -69,7 +69,7 @@ public class DeviceInfoParam implements Serializable {
      */
     @ApiModelProperty("网公司标识")
     @Range(min = 0, max = 2, message = "网公司标识" + ValidMessage.PARAM_FORMAT_ERROR)
-    private int monitorFlag;
+    private Integer monitorFlag;
 
     /**
      * 0-电网侧
@@ -77,7 +77,7 @@ public class DeviceInfoParam implements Serializable {
      */
     @ApiModelProperty("电网侧标识")
     @Range(min = 0, max = 2, message = "电网侧标识" + ValidMessage.PARAM_FORMAT_ERROR)
-    private int powerFlag;
+    private Integer powerFlag;
 
 
 

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

@@ -0,0 +1,29 @@
+package com.njcn.device.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/8/9
+ */
+@Data
+public class LineBaseQueryParam {
+
+    @NotEmpty(message = "监测点索引集合不可为空")
+    @ApiModelProperty(name = "lineIds",value = "监测点索引集合")
+    private List<String> lineIds;
+
+
+    @ApiModelProperty(name = "comFlag",value = "通讯状态 0.离线 1.在线")
+    private Integer comFlag;
+
+    @ApiModelProperty(name = "searchValue",value = "关键字搜索值")
+    private String searchValue;
+}

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

@@ -56,6 +56,9 @@ public class AreaLineInfoVO implements Serializable {
     @ApiModelProperty(name = "pt2",value = "pt2")
     private Integer pt2;
 
+    @ApiModelProperty(name = "objName",value = "对象名称")
+    private String objName;
+
     @ApiModelProperty(name = "runFlag",value = "运行状态")
     private Integer runFlag;
 
@@ -73,4 +76,7 @@ public class AreaLineInfoVO implements Serializable {
 
     @ApiModelProperty(name = "manufacturer",value = "供应商名称")
     private String manufacturer;
+
+    @ApiModelProperty(name = "loadType",value = "干扰源类型")
+    private String loadType;
 }