pv终端台帐 部门增加id查询所有子部门

pqs-device/device-api/src/main/java/com/njcn/device/enums/PvDeviceResponseEnum.java

@@ -26,6 +26,7 @@ public enum PvDeviceResponseEnum {
     VOLTAGE_PARAM_EMPTY("A0358","所属母线不可为空"),
     VOLTAGE_PARAM_EMPTY_MUST("A0359","所属母线必须为空"),
     LV_USER_REPEAT("A0360","低压用户名称重复"),
+    SUBSTATION_CODE_REPEAT("A0351","变电站编号重复"),
 
 
     TEN_VOLTAGE_NULL("A0360","未查询到指定10kV线路"),
@@ -33,11 +34,13 @@ public enum PvDeviceResponseEnum {
     SUB_AREA_NULL("A0362","未查询到指定台区"),
     DEV_NULL("A0363","未查询到指定终端"),
     SUBSTATION_NULL("A0364","未查询到指定变电站"),
+    SUBSTATION_EMPTY("A0364","变电站不可为空"),
     VOLTAGE_NULL("A0365","未查询到指定母线"),
     DEV_NUM_NULL("A0366","当前装置监测点序号已存在"),
     ONE_SUB_VOLTAGE_EMPTY("A0367","I类监测点变电站母线不可为空"),
     TWO_SUB_VOLTAGE_EMPTY_MUST("A0368","II类监测点变电站母线必须为空"),
     LINE_DEVICE_NO_MATCH("A0369","监测点所属装置型号不匹配"),
+    NO_SUB("A0370","当前单位下不存在台区或变电站"),
     ;
 
 

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

@@ -21,6 +21,6 @@ public class DeviceQueryParam extends BaseParam {
     @ApiModelProperty(value = "manufacturer",name = "制造厂商")
     private List<String> manufacturer;
 
-    @ApiModelProperty(value = "devType",name = "设备类型")
-    private List<String> devType;
+    @ApiModelProperty(value = "type",name = "设备类型")
+    private List<String> type;
 }

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

@@ -8,11 +8,13 @@ import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -37,6 +39,10 @@ public class PvDeviceParam implements Serializable {
     @NotBlank(message = "终端类型不可为空")
     private String type;
 
+    @ApiModelProperty(name = "name",value = "装置名称",required = true)
+    @NotBlank(message = "装置名称")
+    private String name;
+
     /**
      * 用于保存PMS中电能质量监测终端Id、智能融合终端Id，智能电表Id
      */
@@ -83,6 +89,29 @@ public class PvDeviceParam implements Serializable {
     @ApiModelProperty(name = "devKey",value = "装置秘钥（3ds加密）")
     private String devKey;
 
+
+    /**
+     * 投运时间
+     */
+    @ApiModelProperty(name = "loadTime",value = "投运时间")
+    @DateTimeStrValid(message = "投运时间格式错误")
+    private LocalDate loadTime;
+
+    /**
+     * 装置通讯状态
+     */
+    @ApiModelProperty(name = "devStatus",value = "装置通讯状态")
+    @NotNull(message = "装置通讯状态不能为空")
+    @Range(min = 0,max = 1)
+    private Integer devStatus;
+
+
+    /**
+     * 信号传输方式
+     */
+    @ApiModelProperty(name = "communicateType",value = "信号传输方式")
+    private String communicateType;
+
     /**
      * 本次定检时间，默认等于投运时间
      */

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

@@ -36,6 +36,13 @@ public class PvDistributedParam implements Serializable {
     @NotBlank(message = "分布式光伏名称不可为空")
     private String name;
 
+    /**
+     * 分布式光伏编号
+     */
+    @ApiModelProperty(name = "code",value = "分布式光伏编号",required = true)
+    @NotBlank(message = "分布式光伏编号不可为空")
+    private String code;
+
     /**
      * 用户编号（与低压用户台账表低压用户编号字段一致）
      */
@@ -79,6 +86,15 @@ public class PvDistributedParam implements Serializable {
     @ApiModelProperty(name = "energyCapacity",value = "储能配置容量（KVA）")
     private Float energyCapacity;
 
+    @ApiModelProperty(name = "smartSwitch",value = "智能开关编号")
+    private String smartSwitch;
+
+    @ApiModelProperty(name = "installTime",value = "安装时间")
+    private String installTime;
+
+    @ApiModelProperty(name = "runTime",value = "投运时间")
+    private String runTime;
+
 
 
     @Data

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

@@ -85,6 +85,10 @@ public class PvLineDetailParam implements Serializable {
     @NotBlank(message = "用户编号不能为空")
     private String userCode;
 
+    @ApiModelProperty(name = "userCodeType",value = "用户编号区分 0.分布式 1.低压用户")
+    @NotNull(message = "用户编号标识")
+    private Integer userCodeType;
+
 
     /**
      * 电压等级
@@ -96,112 +100,91 @@ public class PvLineDetailParam implements Serializable {
      * 线路号（在同一台设备中的监测点号）
      */
     @ApiModelProperty(name = "num",value = "线路号（在同一台设备中的监测点号）")
-    @NotNull(message = "线路号不可为空")
-    @Range(min = 1,max = 10,message = "线路号违规")
     private Integer num;
 
     /**
      * PT一次变比
      */
-    @NotNull(message = "PT一次变比不可为空")
     @ApiModelProperty(name = "pt1",value = "PT一次变比")
     private Float pt1;
 
     /**
      * PT二次变比
      */
-    @NotNull(message = "PT二次变比不可为空")
     @ApiModelProperty(name = "pt2",value = "PT二次变比")
     private Float pt2;
 
     /**
      * CT一次变比
      */
-    @NotNull(message = "CT一次变比不可为空")
     @ApiModelProperty(name = "ct1",value = "CT一次变比")
     private Float ct1;
 
     /**
      * CT二次变比
      */
-    @NotNull(message = "CT二次变比不可为空")
     @ApiModelProperty(name = "ct2",value = "CT二次变比")
     private Float ct2;
 
     /**
      * 设备容量
      */
-    @NotNull(message = "设备容量不可为空")
     @ApiModelProperty(name = "devCapacity",value = "设备容量")
     private Float devCapacity;
 
     /**
      * 短路容量
      */
-    @NotNull(message = "短路容量不可为空")
     @ApiModelProperty(name = "shortCapacity",value = "短路容量")
     private Float shortCapacity;
 
     /**
      * 基准容量
      */
-    @NotNull(message = "基准容量不可为空")
     @ApiModelProperty(name = "standardCapacity",value = "基准容量")
     private Float standardCapacity;
 
     /**
      * 协议容量
      */
-    @NotNull(message = "协议容量不可为空")
     @ApiModelProperty(name = "dealCapacity",value = "协议容量")
     private Float dealCapacity;
 
     /**
-     * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
+     * 接线类型字典表
      */
-    @NotNull(message = "接线类型不可为空")
-    @ApiModelProperty(name = "ptType",value = "接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)")
-    @Range(min = 0,max = 2,message = "接线类型违规")
-    private Integer ptType;
+    @ApiModelProperty(name = "ptType",value = "接线类型字典表")
+    private String ptType;
 
     /**
      * 测量间隔（1-10分钟）
      */
-    @NotNull(message = "测量间隔不可为空")
     @ApiModelProperty(name = "timeInterval",value = "测量间隔（1-10分钟）")
-    @Range(min = 1,max = 10,message = "测量间隔（1-10分钟）")
     private Integer timeInterval;
 
     /**
      * 干扰源类型,字典表
      */
-    @NotNull(message = "干扰源类型不可为空")
     @ApiModelProperty(name = "loadType",value = "干扰源类型,字典表")
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "干扰源类型id违规")
     private String loadType;
 
     /**
      * 行业类型，字典表
      */
-    @NotNull(message = "行业类型不可为空")
+
     @ApiModelProperty(name = "businessType",value = "行业类型，字典表")
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "行业类型id违规")
     private String businessType;
 
     /**
      * 网公司谐波监测平台标志(0-否;1-是)，默认否
      */
-    @NotNull(message = "网公司谐波监测平台标志不可为空")
     @ApiModelProperty(name = "monitorFlag",value = "网公司谐波监测平台标志(0-否;1-是)，默认否")
-    @Range(min = 0,max = 1,message = "网公司谐波监测平台标志违规")
     private Integer monitorFlag;
 
     /**
      * 电网标志（0-电网侧；1-非电网侧）
      */
-    @NotNull(message = "电网标志不可为空")
     @ApiModelProperty(name = "powerFlag",value = "电网标志（0-电网侧；1-非电网侧）")
-    @Range(min = 0,max = 1,message = "电网标志违规")
     private Integer powerFlag;
 
     /**
@@ -216,12 +199,22 @@ public class PvLineDetailParam implements Serializable {
     @ApiModelProperty(name = "objName",value = "监测点对象名称")
     private String objName;
 
+    /**
+     * 监测点对象大类
+     */
+    @ApiModelProperty(name = "smallName",value = "监测点对象大类")
+    private String smallName;
+
+    /**
+     * 监测点对象小类
+     */
+    @ApiModelProperty(name = "bigName",value = "监测点对象小类")
+    private String bigName;
+
     /**
      * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
      */
-    @NotNull(message = "人为干预是否参与统计标志不可为空")
     @ApiModelProperty(name = "statFlag",value = "人为干预是否参与统计（0：不参与，1：参与）默认参与统计")
-    @Range(min = 0,max = 1,message = "为干预是否参与统计违规")
     private Integer statFlag = 1;
 
     /**

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

@@ -103,13 +103,13 @@ public class PvSubAreaParam implements Serializable {
      * 是否安装智能融合终端
      */
     @ApiModelProperty(name = "devFusion",value = "是否安装智能融合终端")
-    private Boolean devFusion;
+    private Integer devFusion;
 
     /**
      * 是否有分布式光伏接入
      */
     @ApiModelProperty(name = "pv",value = "是否有分布式光伏接入")
-    private Boolean pv;
+    private Integer pv;
 
     /**
      * 分布式光伏总装机容量（KVA）

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

@@ -41,6 +41,10 @@ public class PvSubstationParam implements Serializable {
     @NotBlank(message = "变电站名称不能为空")
     private String name;
 
+    @ApiModelProperty(name = "subCode",value = "变电站编号",required = true)
+    @NotBlank(message = "变电站编号不能为空")
+    private String subCode;
+
     /**
      * 电压等级Id，字典表
      */

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

@@ -45,6 +45,13 @@ public class PvTenVoltageParam implements Serializable {
     @NotBlank(message = "线路名称不能为空")
     private String name;
 
+    /**
+     * 线路编号
+     */
+    @ApiModelProperty(name = "code",value = "线路编号",required = true)
+    @NotBlank(message = "线路编号不能为空")
+    private String code;
+
     /**
      * 跨区域类型
      */
@@ -137,6 +144,27 @@ public class PvTenVoltageParam implements Serializable {
     private String putIntoDate;
 
 
+    /**
+     * 是否有分布式光伏接入
+     */
+    @ApiModelProperty(name = "pvStatus",value = "是否有分布式光伏接入 0.否 1.是")
+    private Integer pvStatus;
+
+
+    /**
+     * 分布式光伏接入容量
+     */
+    @ApiModelProperty(name = "pvCapacity",value = "分布式光伏接入容量")
+    private Integer pvCapacity;
+
+
+    /**
+     * 分布式光伏接入数量
+     */
+    @ApiModelProperty(name = "pvNum",value = "分布式光伏接入数量")
+    private Integer pvNum;
+
+
 
     @Data
     @EqualsAndHashCode(callSuper = true)

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

@@ -22,12 +22,18 @@ public class PvTerminalBaseQuery extends BaseParam {
 
     @ApiModelProperty(name = "id",value = "单位变电站台区索引",required = true)
     @NotEmpty(message = "单位变电站台区索引不能为空")
-    private List<String> id;
+    private String id;
 
     @ApiModelProperty(name = "level",value = "0.单位 1.变电站 2.台区",required = true)
     @NotNull(message = "树层级不可为空")
     private Integer level;
 
     @ApiModelProperty(name = "type",value = "字典类型 I II III类监测点类型id")
-    private Integer type;
+    private String type;
+
+    @ApiModelProperty(name = "lineStatus",value = "监测点状态")
+    private Integer lineStatus;
+
+    @ApiModelProperty(name = "runTime",value = "投运时间")
+    private Integer runTime;
 }

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

@@ -23,4 +23,7 @@ public class TenVoltageQueryParam extends BaseParam {
 
     @ApiModelProperty(name = "designScale",value = "电压等级")
     private List<String> designScale;
+
+    @ApiModelProperty(name = "pvStatus",value = "是否有光伏接入")
+    private Integer pvStatus;
 }

pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDevice.java

@@ -31,6 +31,8 @@ public class PvDevice extends BaseEntity {
      */
     private String id;
 
+    private String name;
+
     /**
      * 终端类型（电能质量监测终端、智能电表、智能融合终端），字典表
      */
@@ -71,6 +73,22 @@ public class PvDevice extends BaseEntity {
      */
     private String devKey;
 
+    /**
+     * 投运时间
+     */
+    private LocalDate loadTime;
+
+    /**
+     * 装置通讯状态
+     */
+    private Integer devStatus;
+
+
+    /**
+     * 信号传输方式
+     */
+    private String communicateType;
+
     /**
      * 本次定检时间，默认等于投运时间
      */
@@ -81,6 +99,10 @@ public class PvDevice extends BaseEntity {
      */
     private LocalDate nextTimeCheck;
 
+    /**
+     * 终端级别
+     */
+    private String devGrade;
     /**
      * 状态
      */

pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDistributed.java

@@ -1,10 +1,13 @@
 package com.njcn.device.pojo.po.pv;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -30,16 +33,15 @@ public class PvDistributed extends BaseEntity {
      */
     private String id;
 
-    /**
-     * 所属台区表Id（外键）
-     */
-    private String subAreaId;
 
     /**
      * 分布式光伏名称
      */
     private String name;
 
+
+    private String code;
+
     /**
      * 用户编号（与低压用户台账表低压用户编号字段一致）
      */
@@ -75,6 +77,15 @@ public class PvDistributed extends BaseEntity {
      */
     private Float energyCapacity;
 
+
+    private String smartSwitch;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate installTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate runTime;
+
     /**
      * 状态
      */

pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLineDetail.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -62,6 +63,8 @@ public class PvLineDetail extends BaseEntity {
 
     private String userCode;
 
+    private Integer userCodeType;
+
     /**
      * 电压等级
      */
@@ -115,7 +118,7 @@ public class PvLineDetail extends BaseEntity {
     /**
      * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
      */
-    private Integer ptType;
+    private String ptType;
 
     /**
      * 测量间隔（1-10分钟）
@@ -152,6 +155,14 @@ public class PvLineDetail extends BaseEntity {
      */
     private String objName;
 
+
+    private String smallName;
+
+    /**
+     * 监测点对象小类
+     */
+    private String bigName;
+
     /**
      * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
      */

pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubArea.java

@@ -88,12 +88,12 @@ public class PvSubArea extends BaseEntity {
     /**
      * 是否安装智能融合终端
      */
-    private Boolean devFusion;
+    private Integer devFusion;
 
     /**
      * 是否有分布式光伏接入
      */
-    private Boolean pv;
+    private Integer pv;
 
     /**
      * 分布式光伏总装机容量（KVA）

pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubstation.java

@@ -37,6 +37,11 @@ public class PvSubstation {
      */
     private String name;
 
+    /**
+     * 变电站编号
+     */
+    private String subCode;
+
     /**
      * 电压等级Id，字典表
      */

pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvTenVoltage.java

@@ -39,6 +39,11 @@ public class PvTenVoltage extends BaseEntity {
      */
     private String name;
 
+    /**
+     * 线路编号
+     */
+    private String code;
+
     /**
      * 跨区域类型
      */
@@ -119,6 +124,22 @@ public class PvTenVoltage extends BaseEntity {
      */
     private Integer state;
 
+    /**
+     * 是否有分布式光伏接入
+     */
+    private Integer pvStatus;
+
+
+    /**
+     * 分布式光伏接入容量
+     */
+    private Integer pvCapacity;
+
+
+    /**
+     * 分布式光伏接入数量
+     */
+    private Integer pvNum;
 
 
 }

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

@@ -0,0 +1,124 @@
+package com.njcn.device.pojo.vo.pv;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/28
+ */
+@Data
+public class DisOrLvVO {
+    /**
+     * 低压用户台账表Id
+     */
+    private String id;
+
+
+    /**
+     * 低压用户编号（营销系统中查出）
+     */
+    private String userCode;
+
+    /**
+     * 低压用户名称
+     */
+    private String name;
+
+    /**
+     * 用户协议容量（kVA）
+     */
+    private Float userCapacity;
+
+    /**
+     * 是否发生过投诉
+     */
+    private Integer complain;
+
+    /**
+     * 投诉内容
+     */
+    private String complainPart;
+
+    /**
+     * 整改措施
+     */
+    private String corrective;
+
+    /**
+     * 是否有治理装置
+     */
+    private Integer devGovern;
+
+    /**
+     * 治理装置类型
+     */
+    private String governType;
+
+    /**
+     * 治理装置电压等级
+     */
+    private String scale;
+
+    private String scaleName;
+
+    /**
+     * 治理装置容量
+     */
+    private Float governCapacity;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+
+
+
+
+
+
+
+    private String code;
+
+    /**
+     * 终端编号
+     */
+    private String devCode;
+
+
+    /**
+     * 装机容量（KVA）
+     */
+    private Float machineCapacity;
+
+    /**
+     * 上网方式
+     */
+    private String inteType;
+
+    /**
+     * 接入相别
+     */
+    private String phase;
+
+    /**
+     * 储能配置容量（KVA）
+     */
+    private Float energyCapacity;
+
+
+    private String smartSwitch;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate installTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate runTime;
+
+
+}

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

@@ -0,0 +1,29 @@
+package com.njcn.device.pojo.vo.pv;
+
+import com.njcn.device.pojo.po.pv.PvDevice;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PvDeviceVO extends PvDevice {
+
+    private String devTypeName;
+
+    private String typeName;
+
+    private String typeCode;
+
+    private String manufacturerName;
+
+    /**
+     * 终端级别中文名称
+     */
+    private String devGradeName;
+}

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

@@ -0,0 +1,17 @@
+package com.njcn.device.pojo.vo.pv;
+
+import com.njcn.device.pojo.po.pv.PvDistributed;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PvDistributedVO extends PvDistributed {
+    private String scaleName;
+}

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

@@ -29,11 +29,19 @@ public class PvLineAllDetailVO {
          */
         private String devName;
 
+        private String devId;
+
         /**
          * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
          */
         private String type;
 
+        /**
+         * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
+         */
+        private String typeName;
+
+        private String substationId;
         /**
          * 所属变电站（I类监测点）
          */
@@ -44,29 +52,37 @@ public class PvLineAllDetailVO {
          */
         private String voltageName;
 
+        private String voltageId;
+
         /**
          * 所属台区ID（II类监测点）
          */
         private String subAreaName;
+        private String subAreaId;
 
         private String userCode;
 
+        private String userCodeType;
+
         /**
          * 分布式光伏名称
          */
         private String distributeName;
+        private String distributeId;
 
         /**
          * 低压用户名称
          */
         private String lvUserName;
-
+        private String lvUserId;
 
         /**
          * 电压等级
          */
         private String scale;
 
+        private String scaleName;
+
         /**
          * 线路号（在同一台设备中的监测点号）
          */
@@ -113,9 +129,11 @@ public class PvLineAllDetailVO {
         private Float dealCapacity;
 
         /**
-         * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
+         * 接线类型
          */
-        private Integer ptType;
+        private String ptType;
+
+        private String ptTypeName;
 
         /**
          * 测量间隔（1-10分钟）
@@ -126,6 +144,7 @@ public class PvLineAllDetailVO {
          * 干扰源类型,字典表
          */
         private String loadType;
+        private String loadTypeName;
 
         /**
          * 行业类型，字典表
@@ -152,6 +171,16 @@ public class PvLineAllDetailVO {
          */
         private String objName;
 
+        /**
+         * 监测点对象小类
+         */
+        private String smallName;
+
+        /**
+         * 监测点对象大类
+         */
+        private String bigName;
+
         /**
          * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
          */
@@ -167,6 +196,8 @@ public class PvLineAllDetailVO {
          */
         private String tfType;
 
+        private String tfTypeName;
+
         /**
          * 所属变压器编号
          */
@@ -177,6 +208,8 @@ public class PvLineAllDetailVO {
          */
         private String groundType;
 
+        private String groundTypeName;
+
         /**
          * 投运日期
          */
@@ -198,6 +231,13 @@ public class PvLineAllDetailVO {
         private Integer state;
 
 
+        /**
+         * 监测点状态
+         * @author cdf
+         * @date 2022/7/27
+         */
+        private Integer lineStatus;
+
 }
 
 

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

@@ -0,0 +1,17 @@
+package com.njcn.device.pojo.vo.pv;
+
+import com.njcn.device.pojo.po.pv.PvLvUser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PvLvUserVO extends PvLvUser {
+    private String scaleName;
+}

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

@@ -0,0 +1,26 @@
+package com.njcn.device.pojo.vo.pv;
+
+import com.njcn.device.pojo.po.pv.PvSubArea;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PvSubAreaVO extends PvSubArea {
+
+    @ApiModelProperty(name = "scaleName",value = "电压等级")
+    private String scaleName;
+
+    @ApiModelProperty(name = "unitName",value = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty(name = "tenVoltageName",value = "10kv线路表")
+    private String tenVoltageName;
+}

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

@@ -21,6 +21,7 @@ public class PvSubstationVO {
      */
     private String unitId;
 
+
     /**
      * 所属单位名称
      */
@@ -31,6 +32,11 @@ public class PvSubstationVO {
      */
     private String name;
 
+    /**
+     * 变电站编号
+     */
+    private String subCode;
+
     /**
      * 电压等级Id，字典表
      */

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

@@ -0,0 +1,27 @@
+package com.njcn.device.pojo.vo.pv;
+
+import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
+import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
+import com.njcn.device.pojo.po.pv.PvTenVoltage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PvTenVoltageVO extends PvTenVoltage {
+
+
+    private String scaleName;
+
+    @ApiModelProperty(name = "designScaleName",value = "设计电压",required = true)
+    private String designScaleName;
+
+}