1.字典表 终端类型改为型号 2.分布式光伏台账

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

@@ -41,7 +41,7 @@ public enum DeviceResponseEnum {
     NODE_INFO_FAIL("A0261","前置机服务器为空"),
 
 
-    SUBV_NAME_REPETITION("A0262","母线名称重复"),
+    SUBV_NAME_REPETITION("A0262","同一变电站下母线名称重复"),
     SUBV_NAME_SAME("A0263","母线名称已存在"),
     SUBV_NO("A0264","母线不存在"),
 
@@ -52,9 +52,12 @@ public enum DeviceResponseEnum {
 
     DEVICE_LINE_BIG("A0268","每台装置下监测点数量最多6个"),
 
+
     DEVICE_UNKNOWN_ERROR("A0269","终端服务未知异常"),
 
     PARENT_INDEX_LACK("A0270","索引和实体同时存在"),
+    DEVICE_VOLTAGE_BIG("A0271","每台装置下母线数量最多6个"),
+    VOLTAGE_NUM_USE("A0272","母线序号已存在"),
     REQUEST_DATA_ERROR("A2071","请求体格式有误"),
     DEPT_LINE_EMPTY("A2072","当前用户部门未有监测点绑定"),
     DIC_GET_EMPTY("A2073","字典获取为空"),
@@ -63,12 +66,13 @@ public enum DeviceResponseEnum {
 
     INVALID_LEVEL("A2074","非法拓扑等级"),
     LINE_EMPTY("A2075","监测点为空"),
+
     /*excel相关*/
     Excel_ERROR("A2080","excel解析异常"),
 
     FLOW_SAME_NAME("A0350","当前名称已存在"),
     FLOW_FLAG("A0351","默认类型已存在"),
-    FLOW_ERROR("A0352","占比参数异常");
+    FLOW_ERROR("A0352","占比参数异常")
 
 
 
@@ -76,6 +80,10 @@ public enum DeviceResponseEnum {
 
 
 
+    ;
+
+
+
 
 
     private final String code;

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

@@ -0,0 +1,48 @@
+package com.njcn.device.enums;
+
+import lombok.Getter;
+
+/**
+ * pqs
+ * 终端枚举
+ * @author cdf
+ * @date 2021/6/21
+ */
+@Getter
+public enum PvDeviceResponseEnum {
+
+    /**
+     * A0350 ~ A0450 用于pv终端模块的枚举
+      */
+    UNIT_REPEAT("A0350","单位名称重复"),
+    SUBSTATION_REPEAT("A0351","变电站名称重复"),
+    TEN_VOLTAGE_REPEAT("A0352","10kV线路名称重复"),
+    VOLTAGE_REPEAT("A0352","母线名称重复"),
+    SUB_AREA_REPEAT("A0353","台区名称重复"),
+    SUB_NUM_REPEAT("A0354","母线号重复"),
+
+
+
+    TEN_VOLTAGE_NULL("A0360","未查询到指定10kV线路"),
+    UNIT_NULL("A0361","未查询到指定单位"),
+    SUB_AREA_NULL("A0362","未查询到指定台区"),
+    DEV_NULL("A0363","未查询到指定终端")
+
+
+
+
+    ;
+
+
+
+
+
+    private final String code;
+
+    private final String message;
+
+    PvDeviceResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

pqs-device/device-api/src/main/java/com/njcn/device/pojo/bo/excel/OracleTerminalExcel.java

@@ -81,7 +81,7 @@ public class OracleTerminalExcel implements Serializable {
     @NotNull(message = "定检状态不能为空")
     private Integer checkFlag;
 
-    @Excel(name = "终端类型", width = 15)
+    @Excel(name = "终端型号", width = 15)
     @NotBlank(message = "设备型号不能为空")
     private String devType;
 

pqs-device/device-api/src/main/java/com/njcn/device/pojo/bo/excel/TerminalBaseExcel.java

@@ -74,12 +74,12 @@ public class TerminalBaseExcel implements Serializable {
     @NotBlank(message = "终端厂家不能为空")
     private String manufacturer;
 
-    @Excel(name = "终端类型", width = 15)
+    @Excel(name = "设备型号", width = 15)
     @NotBlank(message = "设备型号不能为空")
     private String devType;
 
     @Excel(name = "网络参数", width = 15)
-    @NotBlank(message = "设备ip不能为空")
+    @NotBlank(message = "设备网络参数不能为空")
     private String ip;
 
     @Excel(name = "端口", width = 15)
@@ -112,7 +112,7 @@ public class TerminalBaseExcel implements Serializable {
     private String sim;
 
     @Excel(name = "母线", width = 15)
-    @NotBlank(message = "母线不能为空")
+    @NotBlank(message = "母线名称不能为空")
     private String subvName;
 
     @Excel(name = "母线号", width = 15)
@@ -127,9 +127,6 @@ public class TerminalBaseExcel implements Serializable {
     @NotNull(message = "母线模型不为空")
     private Integer subvModel;
 
-    @Excel(name = "监测点索引", width = 15)
-    @NotNull(message = "监测点索引不能为空")
-    private Integer id;
 
     @Excel(name = "监测点名称", width = 15)
     @NotBlank(message = "监测点名称不能为空")

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

@@ -39,7 +39,7 @@ public class VersionParam {
     private LocalDate date;
 
     /**
-     * 装置系列(终端类型),字典表
+     * 装置系列(终端型号),字典表
      */
     @ApiModelProperty("装置系列(终端类型)")
     private String devType;

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

@@ -0,0 +1,26 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DeviceQueryParam extends BaseParam {
+
+
+    @ApiModelProperty(value = "manufacturer",name = "制造厂商")
+    private List<String> manufacturer;
+
+    @ApiModelProperty(value = "devType",name = "设备类型")
+    private List<String> devType;
+}

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

@@ -0,0 +1,25 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DistributedQueryParam extends BaseParam {
+
+    @ApiModelProperty(value = "name",name = "分布式光伏台账名称")
+    private String name;
+
+    @ApiModelProperty(value = "scale",name = "电压等级")
+    private List<String> scale;
+}

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

@@ -0,0 +1,23 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LineDetailQueryParam extends BaseParam {
+
+    @ApiModelProperty(value = "scale",name = "分布式光伏台账名称",required = true)
+    private String name;
+
+    @ApiModelProperty(value = "scale",name = "电压等级")
+    private String scale;
+}

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

@@ -0,0 +1,28 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LvUserQueryParam extends BaseParam {
+
+    @ApiModelProperty(value = "scale",name = "低压侧台账名称")
+    private String name;
+
+    @ApiModelProperty(value = "userCode",name = "用户编号")
+    private String userCode;
+
+    @ApiModelProperty(value = "scale",name = "电压等级")
+    private List<String> scale;
+}

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

@@ -0,0 +1,116 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.constant.ValidMessage;
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+@TableName("pv_device")
+public class PvDeviceParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 终端类型（电能质量监测终端、智能电表、智能融合终端），字典表
+     */
+    @ApiModelProperty(name = "type",value = "终端类型（电能质量监测终端、智能电表、智能融合终端），字典表",required = true)
+    @NotBlank(message = "终端类型不可为空")
+    private String type;
+
+    /**
+     * 用于保存PMS中电能质量监测终端Id、智能融合终端Id，智能电表Id
+     */
+    @ApiModelProperty(name = "devCode",value = "用于保存PMS中电能质量监测终端Id、智能融合终端Id，智能电表Id",required = true)
+    @NotBlank(message = "终端Id不能为空")
+    private String devCode;
+
+    /**
+     * 终端Ip
+     */
+    @ApiModelProperty(name = "ip",value = "终端Ip",required = true)
+    @NotBlank(message = "终端Ip不能为空")
+    private String ip;
+
+    /**
+     * 端口
+     */
+    @ApiModelProperty(name = "port",value = "端口",required = true)
+    @NotNull(message = "端口不能为空")
+    private Integer port;
+
+    /**
+     * 终端型号（570、580……）字典表
+     */
+    @ApiModelProperty(name = "devType",value = "终端型号（570、580……）字典表")
+    private String devType;
+
+    /**
+     * 设备制造商，字典表
+     */
+    @ApiModelProperty(name = "manufacturer",value = "设备制造商，字典表",required = true)
+    @NotBlank(message = "设备制造商不能为空")
+    private String manufacturer;
+
+    /**
+     * 装置识别码（3ds加密）
+     */
+    @ApiModelProperty(name = "series",value = "装置识别码（3ds加密）")
+    private String series;
+
+    /**
+     * 装置秘钥（3ds加密）
+     */
+    @ApiModelProperty(name = "devKey",value = "装置秘钥（3ds加密）")
+    private String devKey;
+
+    /**
+     * 本次定检时间，默认等于投运时间
+     */
+    @ApiModelProperty(name = "thisTimeCheck",value = "本次定检时间，默认等于投运时间",required = true)
+    @NotBlank(message = "本次定检时间不能为空")
+    @DateTimeStrValid(message = "本次定检时间格式错误")
+    private String thisTimeCheck;
+
+    /**
+     * 下次定检时间,默认为投运时间后推3年，假如时间小于3个月则为待检
+     */
+    @ApiModelProperty(name = "nextTimeCheck",value = "下次定检时间,默认为投运时间后推3年，假如时间小于3个月则为待检",required = true)
+    @NotBlank(message = "下次定检时间不能为空")
+    @DateTimeStrValid(message = "下次定检时间格式错误")
+    private String nextTimeCheck;
+
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePvDeviceParam extends PvDeviceParam{
+        /**
+         * id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+}

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

@@ -0,0 +1,36 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Getter
+@Setter
+@TableName("pv_dispatch")
+public class PvDispatchParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 调度表Id
+     */
+    private String id;
+
+    /**
+     * 调度名称
+     */
+    private String name;
+
+
+}

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

@@ -0,0 +1,97 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-06
+ */
+@Data
+public class PvDistributedParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 分布式光伏名称
+     */
+    @ApiModelProperty(name = "name",value = "分布式光伏名称",required = true)
+    @NotBlank(message = "分布式光伏名称不可为空")
+    private String name;
+
+    /**
+     * 用户编号（与低压用户台账表低压用户编号字段一致）
+     */
+    @ApiModelProperty(name = "userCode",value = "用户编号",required = true)
+    @NotBlank(message = "用户编号不可为空")
+    private String userCode;
+
+    /**
+     * 终端编号
+     */
+    @ApiModelProperty(name = "devCode",value = "终端编号")
+    private String devCode;
+
+    /**
+     * 并网电压等级Id，字典表
+     */
+    @ApiModelProperty(name = "scale",value = "并网电压等级Id，字典表")
+    private String scale;
+
+    /**
+     * 装机容量（KVA）
+     */
+    @ApiModelProperty(name = "machineCapacity",value = "装机容量（KVA）")
+    private Float machineCapacity;
+
+    /**
+     * 上网方式
+     */
+    @ApiModelProperty(name = "inteType",value = "上网方式")
+    private String inteType;
+
+    /**
+     * 接入相别
+     */
+    @ApiModelProperty(name = "phase",value = "接入相别")
+    private String phase;
+
+    /**
+     * 储能配置容量（KVA）
+     */
+    @ApiModelProperty(name = "energyCapacity",value = "储能配置容量（KVA）")
+    private Float energyCapacity;
+
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePvDistributedParam extends PvDistributedParam{
+        /**
+         * id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+
+}

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

@@ -0,0 +1,239 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+public class PvLineDetailParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+    /**
+     * 所属终端
+     */
+    @ApiModelProperty(name = "",value = "",required = true)
+    private String devId;
+
+    /**
+     * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
+     */
+    @ApiModelProperty(name = "",value = "",required = true)
+    private String type;
+
+    /**
+     * 所属变电站（I类监测点）
+     */
+    @ApiModelProperty(name = "",value = "",required = true)
+    private String substationId;
+
+    /**
+     * 所属母线名称（I类监测点）
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String voltageId;
+
+    /**
+     * 所属台区ID（II类监测点）
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String subAreaId;
+
+    /**
+     * 所属分布式光伏台账（III类监测点）
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String distributedId;
+
+    /**
+     * 所属低压用户台账（III类监测点）
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String lvUserId;
+
+    /**
+     * 线路号（在同一台设备中的监测点号）
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Integer num;
+
+    /**
+     * PT一次变比
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Float pt1;
+
+    /**
+     * PT二次变比
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Float pt2;
+
+    /**
+     * CT一次变比
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Float ct1;
+
+    /**
+     * CT二次变比
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Float ct2;
+
+    /**
+     * 设备容量
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Float devCapacity;
+
+    /**
+     * 短路容量
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Float shortCapacity;
+
+    /**
+     * 基准容量
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Float standardCapacity;
+
+    /**
+     * 协议容量
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Float dealCapacity;
+
+    /**
+     * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Integer ptType;
+
+    /**
+     * 测量间隔（1-10分钟）
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Integer timeInterval;
+
+    /**
+     * 干扰源类型,字典表
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String loadType;
+
+    /**
+     * 行业类型，字典表
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String businessType;
+
+    /**
+     * 网公司谐波监测平台标志(0-否;1-是)，默认否
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Integer monitorFlag;
+
+    /**
+     * 电网标志（0-电网侧；1-非电网侧）
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Integer powerFlag;
+
+    /**
+     * 国网谐波监测平台监测点号
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String monitorId;
+
+    /**
+     * 监测点对象名称
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String objName;
+
+    /**
+     * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Integer statFlag;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String remark;
+
+    /**
+     * 电压互感器类型，字典表
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String tfType;
+
+    /**
+     * 所属变压器编号
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String tfCode;
+
+    /**
+     * 中性点接地方式，字典表
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String groundType;
+
+    /**
+     * 投运日期
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String putIn;
+
+    /**
+     * 接入日期
+     */
+    @ApiModelProperty(name = "",value = "")
+    private String access;
+
+    /**
+     * 是否专项供电（0：否，1：是）默认参与统计
+     */
+    @ApiModelProperty(name = "",value = "")
+    private Integer powerSupply;
+
+   
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePvLineDetailParam extends PvLineDetailParam{
+        /**
+         * id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+
+
+}

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

@@ -0,0 +1,107 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+public class PvLvUserParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 低压用户编号（营销系统中查出）
+     */
+    @ApiModelProperty(name = "userCode",value = "低压用户编号")
+    @NotBlank(message = "低压用户编号不为空")
+    private String userCode;
+
+    /**
+     * 低压用户名称
+     */
+    @ApiModelProperty(name = "name",value = "低压用户名称")
+    @NotBlank(message = "低压用户名称不为空")
+    private String name;
+
+    /**
+     * 用户协议容量（kVA）
+     */
+    @ApiModelProperty(name = "userCapacity",value = "用户协议容量")
+    private Float userCapacity;
+
+    /**
+     * 是否发生过投诉
+     */
+    @ApiModelProperty(name = "complain",value = "是否发生过投诉")
+    private Integer complain;
+
+    /**
+     * 投诉内容
+     */
+    @ApiModelProperty(name = "complainPart",value = "投诉内容")
+    private String complainPart;
+
+    /**
+     * 整改措施
+     */
+    @ApiModelProperty(name = "corrective",value = "整改措施")
+    private String corrective;
+
+    /**
+     * 是否有治理装置
+     */
+    @ApiModelProperty(name = "devGovern",value = "是否有治理装置")
+    private Integer devGovern;
+
+    /**
+     * 治理装置类型
+     */
+    @ApiModelProperty(name = "governType",value = "治理装置类型")
+    private String governType;
+
+    /**
+     * 治理装置电压等级
+     */
+    @ApiModelProperty(name = "scale",value = "治理装置电压等级")
+    private String scale;
+
+    /**
+     * 治理装置容量
+     */
+    @ApiModelProperty(name = "governCapacity",value = "治理装置容量")
+    private Float governCapacity;
+
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePvLvUserParam extends PvLvUserParam{
+        /**
+         * id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+
+
+}

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

@@ -0,0 +1,148 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+public class PvSubAreaParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+    /**
+     * 所属10kV线路表Id（外键）
+     */
+    @ApiModelProperty(name = "tenVoltageId",value = "所属10kV线路表Id",required = true)
+    @NotBlank(message = "所属10kV线路表Id不可为空")
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "所属10kV线路表Id格式有误")
+    private String tenVoltageId;
+
+    /**
+     * 所属单位Id（台区所属的单位和变电站所属单位可能不是一个单位）
+     */
+    @ApiModelProperty(name = "unitId",value = "所属单位Id",required = true)
+    @NotBlank(message = "所属单位Id不可为空")
+    private String unitId;
+
+    /**
+     * 台区名称
+     */
+    @ApiModelProperty(name = "name",value = "台区名称",required = true)
+    @NotBlank(message = "台区名称不可为空")
+    private String name;
+
+    /**
+     * 台区编号
+     */
+    @ApiModelProperty(name = "code",value = "台区编号",required = true)
+    @NotBlank(message = "台区编号不可为空")
+    private String code;
+
+    /**
+     * 电缆长度字段
+     */
+    @ApiModelProperty(name = "cableLength",value = "电缆长度字段")
+    private Double cableLength;
+
+    /**
+     * 电阻
+     */
+    @ApiModelProperty(name = "resistance",value = "电阻")
+    private Double resistance;
+
+    /**
+     * 电抗
+     */
+    @ApiModelProperty(name = "reactance",value = "电抗")
+    private Double reactance;
+
+    /**
+     * 变压器型号
+     */
+    @ApiModelProperty(name = "type",value = "变压器型号")
+    private String type;
+
+    /**
+     * 变压器容量
+     */
+    @ApiModelProperty(name = "capacity",value = "变压器容量")
+    private Float capacity;
+
+    /**
+     * 变压器调压方式
+     */
+    @ApiModelProperty(name = "regulationMode",value = "变压器调压方式")
+    private Integer regulationMode;
+
+    /**
+     * 台区无功补偿容量（KVA）
+     */
+    @ApiModelProperty(name = "reactCapacity",value = "台区无功补偿容量（KVA）")
+    private Float reactCapacity;
+
+    /**
+     * 是否安装智能融合终端
+     */
+    @ApiModelProperty(name = "devFusion",value = "是否安装智能融合终端")
+    private Boolean devFusion;
+
+    /**
+     * 是否有分布式光伏接入
+     */
+    @ApiModelProperty(name = "pv",value = "是否有分布式光伏接入")
+    private Boolean pv;
+
+    /**
+     * 分布式光伏总装机容量（KVA）
+     */
+    @ApiModelProperty(name = "totalC",value = "分布式光伏总装机容量（KVA）")
+    private Float totalC;
+
+    /**
+     * 分布式光伏用户数量
+     */
+    @ApiModelProperty(name = "pvUsers",value = "分布式光伏用户数量")
+    private Integer pvUsers;
+
+    /**
+     * 其他分布式电源装置容量
+     */
+    @ApiModelProperty(name = "powerPower",value = "其他分布式电源装置容量")
+    private Float powerPower;
+
+
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePvSubAreaParam extends PvSubAreaParam{
+        /**
+         * id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+
+}

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

@@ -0,0 +1,79 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+public class PvSubstationParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+    /**
+     * 所属单位Id
+     */
+    @ApiModelProperty(name = "unitId",value = "所属单位Id",required = true)
+    @NotBlank(message = "所属单位Id不能为空")
+    private String unitId;
+
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "name",value = "变电站名称",required = true)
+    @NotBlank(message = "变电站名称不能为空")
+    private String name;
+
+    /**
+     * 电压等级Id，字典表
+     */
+    @ApiModelProperty(name = "scale",value = "电压等级Id",required = true)
+    @NotBlank(message = "电压等级不能为空")
+    private String scale;
+
+    /**
+     * 变电站总容量（MVA）(手动填写)
+     */
+    @ApiModelProperty(name = "totalCapacity",value = "变电站总容量",required = true)
+    @NotNull(message = "变电站总容量不能为空")
+    private Double totalCapacity;
+
+    /**
+     * 运维班组Code
+     */
+    @ApiModelProperty(name = "teamCode",value = "运维班组Code",required = true)
+    @NotBlank(message = "运维班组Code不能为空")
+    private String teamCode;
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePvSubstationParam extends PvSubstationParam{
+        /**
+         * id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+
+}

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

@@ -0,0 +1,154 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.constant.ValidMessage;
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+public class PvTenVoltageParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+    /**
+     * 调度表Id（外键）
+     */
+    @ApiModelProperty(name = "dispatchId",value = "调度表Id",required = true)
+    @NotBlank(message = "调度表Id不能为空")
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "id格式违规")
+    private String dispatchId;
+
+
+    /**
+     * 线路名称
+     */
+    @ApiModelProperty(name = "name",value = "线路名称",required = true)
+    @NotBlank(message = "线路名称不能为空")
+    private String name;
+
+    /**
+     * 跨区域类型
+     */
+    @ApiModelProperty(name = "crType",value = "跨区域类型")
+    private String crType;
+
+    /**
+     * 电压等级Id，字典表
+     */
+    @ApiModelProperty(name = "scale",value = "电压等级Id，字典表")
+    private String scale;
+
+    /**
+     * 设计电压等级Id，字典表
+     */
+    @ApiModelProperty(name = "designScale",value = "设计电压等级Id，字典表")
+    private String designScale;
+
+    /**
+     * 设备状态
+     */
+    @ApiModelProperty(name = "devStatus",value = "设备状态")
+    private Integer devStatus;
+
+    /**
+     * 是否接地极(0:false;1:true)
+     */
+    @ApiModelProperty(name = "earthing",value = "是否接地极(0:false;1:true)")
+    private Boolean earthing;
+
+    /**
+     * 线路性质
+     */
+    @ApiModelProperty(name = "quality",value = "线路性质")
+    private String quality;
+
+    /**
+     * 所属主线
+     */
+    @ApiModelProperty(name = "masterStroke",value = "所属主线")
+    private String masterStroke;
+
+    /**
+     * 专业分类
+     */
+    @ApiModelProperty(name = "major",value = "专业分类")
+    private String major;
+
+    /**
+     * 设备主人
+     */
+    @ApiModelProperty(name = "master",value = "设备主人")
+    private String master;
+
+    /**
+     * 起点电站
+     */
+    @ApiModelProperty(name = "startStation",value = "起点电站")
+    private String startStation;
+
+    /**
+     * 终点电站
+     */
+    @ApiModelProperty(name = "endStation",value = "终点电站")
+    private String endStation;
+
+    /**
+     * 运行负载限额
+     */
+    @ApiModelProperty(name = "runLoad",value = "运行负载限额")
+    private Float runLoad;
+
+    /**
+     * 额定输出功率
+     */
+    @ApiModelProperty(name = "outputPower",value = "额定输出功率")
+    private Float outputPower;
+
+    /**
+     * 最大允许电流
+     */
+    @ApiModelProperty(name = "maxCurrent",value = "最大允许电流")
+    private Float maxCurrent;
+
+    /**
+     * 投运日期
+     */
+    @ApiModelProperty(name = "putIntoDate",value = "投运日期")
+    @DateTimeStrValid(message = "投运时间格式错误",format = "yyyy-MM-dd HH:mm:ss")
+    private String putIntoDate;
+
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePvTenVoltageParam extends PvTenVoltageParam{
+        /**
+         * id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+
+}

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

@@ -0,0 +1,66 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+public class PvUnitParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+    /**
+     * 父节点（0为根节点）
+     */
+    @ApiModelProperty(name = "pid",value = "父节点（0为根节点）")
+    @NotBlank(message = "父节点id不能为空")
+    private String pid;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "name",value = "单位名称")
+    @NotBlank(message = "单位名称不能为空")
+    private String name;
+
+    /**
+     * 单位编码
+     */
+    @ApiModelProperty(name = "code",value = "单位编码")
+    @NotBlank(message = "单位编码不能为空")
+    private String code;
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePvUnitParam extends PvUnitParam{
+        /**
+         * id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+
+}

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

@@ -0,0 +1,76 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+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;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+public class PvVoltageParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 母线名称
+     */
+    @ApiModelProperty(value = "母线名称",required = true)
+    @NotBlank(message = "母线名称不可为空")
+    private String name;
+
+    /**
+     * 母线号（在同一台设备中的电压通道号）
+     */
+    @ApiModelProperty(value = "母线号（在同一台设备中的电压通道号）",required = true)
+    @NotNull(message = "母线号不可为空")
+    @Range(min = 1,max = 6,message = "选择1-6路母线号线路")
+    private Integer num;
+
+    /**
+     * 电压等级Id，字典表
+     */
+    @ApiModelProperty(value = "电压等级Id，字典表",required = true)
+    @NotBlank(message = "电压等级不可为空")
+    private String scale;
+
+    /**
+     * 母线模型（0：虚拟母线；1：实际母线）默认是实际母线
+     */
+    @ApiModelProperty(value = "母线模型（0：虚拟母线；1：实际母线）默认是实际母线",required = true)
+    @NotNull(message = "母线模型不可为空")
+    private Integer model;
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePvVoltageParam extends PvVoltageParam{
+        /**
+         * id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+
+
+}

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

@@ -0,0 +1,33 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SubAreaQueryParam extends BaseParam {
+
+    @ApiModelProperty("所属10kV线路id")
+    private List<String> tenVoltageId;
+
+    @ApiModelProperty("所属单位id")
+    private List<String> unitId;
+
+    @ApiModelProperty("台区名称")
+    private String name;
+
+    @ApiModelProperty("是否接入")
+    private Boolean isJoin;
+
+
+}

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

@@ -0,0 +1,26 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/5
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SubstationQueryParam extends BaseParam {
+
+    @ApiModelProperty(value = "单位id",name = "unitId")
+    private List<String> unitId;
+
+    @ApiModelProperty(value = "电压等级",name = "scale")
+    private List<String> scale;
+}

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

@@ -0,0 +1,26 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/5
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TenVoltageQueryParam extends BaseParam {
+
+    @ApiModelProperty(name = "scale",value = "电压等级")
+    private List<String> scale;
+
+    @ApiModelProperty(name = "designScale",value = "电压等级")
+    private List<String> designScale;
+}

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

@@ -0,0 +1,23 @@
+package com.njcn.device.pojo.param.pv;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class VoltageQueryParam extends BaseParam {
+
+    @ApiModelProperty(value = "scale",name = "母线名称",required = true)
+    private String name;
+
+    @ApiModelProperty(value = "scale",name = "电压等级")
+    private String scale;
+}

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

@@ -0,0 +1,91 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+@TableName("pv_device")
+@EqualsAndHashCode(callSuper = true)
+public class PvDevice extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 终端台账表Id
+     */
+    private String id;
+
+    /**
+     * 终端类型（电能质量监测终端、智能电表、智能融合终端），字典表
+     */
+    private String type;
+
+    /**
+     * 用于保存PMS中电能质量监测终端Id、智能融合终端Id，智能电表Id
+     */
+    private String devCode;
+
+    /**
+     * 终端Ip
+     */
+    private String ip;
+
+    /**
+     * 端口
+     */
+    private Integer port;
+
+    /**
+     * 终端型号（570、580……）字典表
+     */
+    private String devType;
+
+    /**
+     * 设备制造商，字典表
+     */
+    private String manufacturer;
+
+    /**
+     * 装置识别码（3ds加密）
+     */
+    private String series;
+
+    /**
+     * 装置秘钥（3ds加密）
+     */
+    private String devKey;
+
+    /**
+     * 本次定检时间，默认等于投运时间
+     */
+    private LocalDate thisTimeCheck;
+
+    /**
+     * 下次定检时间,默认为投运时间后推3年，假如时间小于3个月则为待检
+     */
+    private LocalDate nextTimeCheck;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+
+
+}

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

@@ -0,0 +1,35 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Getter
+@Setter
+@TableName("pv_dispatch")
+public class PvDispatch extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 调度表Id
+     */
+    private String id;
+
+    /**
+     * 调度名称
+     */
+    private String name;
+
+
+}

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

@@ -0,0 +1,86 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-06
+ */
+@Data
+@TableName("pv_distributed")
+@EqualsAndHashCode(callSuper = true)
+public class PvDistributed extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分布式光伏台账表Id
+     */
+    private String id;
+
+    /**
+     * 所属台区表Id（外键）
+     */
+    private String subAreaId;
+
+    /**
+     * 分布式光伏名称
+     */
+    private String name;
+
+    /**
+     * 用户编号（与低压用户台账表低压用户编号字段一致）
+     */
+    private String userCode;
+
+    /**
+     * 终端编号
+     */
+    private String devCode;
+
+    /**
+     * 并网电压等级Id，字典表
+     */
+    private String scale;
+
+    /**
+     * 装机容量（KVA）
+     */
+    private Float machineCapacity;
+
+    /**
+     * 上网方式
+     */
+    private String inteType;
+
+    /**
+     * 接入相别
+     */
+    private String phase;
+
+    /**
+     * 储能配置容量（KVA）
+     */
+    private Float energyCapacity;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+
+
+
+}

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

@@ -0,0 +1,201 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+@TableName("pv_line_detail")
+@EqualsAndHashCode(callSuper = true)
+public class PvLineDetail extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点序号
+     */
+    private String id;
+
+    /**
+     * 所属终端
+     */
+    private String devId;
+
+    /**
+     * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
+     */
+    private String type;
+
+    /**
+     * 所属变电站（I类监测点）
+     */
+    private String substationId;
+
+    /**
+     * 所属母线名称（I类监测点）
+     */
+    private String voltageId;
+
+    /**
+     * 所属台区ID（II类监测点）
+     */
+    private String subAreaId;
+
+    /**
+     * 所属分布式光伏台账（III类监测点）
+     */
+    private String distributedId;
+
+    /**
+     * 所属低压用户台账（III类监测点）
+     */
+    private String lvUserId;
+
+    /**
+     * 线路号（在同一台设备中的监测点号）
+     */
+    private Integer num;
+
+    /**
+     * PT一次变比
+     */
+    private Float pt1;
+
+    /**
+     * PT二次变比
+     */
+    private Float pt2;
+
+    /**
+     * CT一次变比
+     */
+    private Float ct1;
+
+    /**
+     * CT二次变比
+     */
+    private Float ct2;
+
+    /**
+     * 设备容量
+     */
+    private Float devCapacity;
+
+    /**
+     * 短路容量
+     */
+    private Float shortCapacity;
+
+    /**
+     * 基准容量
+     */
+    private Float standardCapacity;
+
+    /**
+     * 协议容量
+     */
+    private Float dealCapacity;
+
+    /**
+     * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
+     */
+    private Integer ptType;
+
+    /**
+     * 测量间隔（1-10分钟）
+     */
+    private Integer timeInterval;
+
+    /**
+     * 干扰源类型,字典表
+     */
+    private String loadType;
+
+    /**
+     * 行业类型，字典表
+     */
+    private String businessType;
+
+    /**
+     * 网公司谐波监测平台标志(0-否;1-是)，默认否
+     */
+    private Integer monitorFlag;
+
+    /**
+     * 电网标志（0-电网侧；1-非电网侧）
+     */
+    private Integer powerFlag;
+
+    /**
+     * 国网谐波监测平台监测点号
+     */
+    private String monitorId;
+
+    /**
+     * 监测点对象名称
+     */
+    private String objName;
+
+    /**
+     * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
+     */
+    private Integer statFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 电压互感器类型，字典表
+     */
+    private String tfType;
+
+    /**
+     * 所属变压器编号
+     */
+    private String tfCode;
+
+    /**
+     * 中性点接地方式，字典表
+     */
+    private String groundType;
+
+    /**
+     * 投运日期
+     */
+    private LocalDateTime putIn;
+
+    /**
+     * 接入日期
+     */
+    private LocalDateTime access;
+
+    /**
+     * 是否专项供电（0：否，1：是）默认参与统计
+     */
+    private Integer powerSupply;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+
+
+
+}

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

@@ -0,0 +1,91 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+@TableName("pv_lv_user")
+@EqualsAndHashCode(callSuper = true)
+public class PvLvUser extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 低压用户台账表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 Float governCapacity;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+
+
+}

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

@@ -0,0 +1,119 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+@TableName("pv_sub_area")
+@EqualsAndHashCode(callSuper = true)
+public class PvSubArea extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 台区表Id
+     */
+    private String id;
+
+    /**
+     * 所属10kV线路表Id（外键）
+     */
+    private String tenVoltageId;
+
+    /**
+     * 所属单位Id（台区所属的单位和变电站所属单位可能不是一个单位）
+     */
+    private String unitId;
+
+    /**
+     * 台区名称
+     */
+    private String name;
+
+    /**
+     * 台区编号
+     */
+    private String code;
+
+    /**
+     * 电缆长度字段
+     */
+    private Double cableLength;
+
+    /**
+     * 电阻
+     */
+    private Double resistance;
+
+    /**
+     * 电抗
+     */
+    private Double reactance;
+
+    /**
+     * 变压器型号
+     */
+    private String type;
+
+    /**
+     * 变压器容量
+     */
+    private Float capacity;
+
+    /**
+     * 变压器调压方式
+     */
+    private Integer regulationMode;
+
+    /**
+     * 台区无功补偿容量（KVA）
+     */
+    private Float reactCapacity;
+
+    /**
+     * 是否安装智能融合终端
+     */
+    private Boolean devFusion;
+
+    /**
+     * 是否有分布式光伏接入
+     */
+    private Boolean pv;
+
+    /**
+     * 分布式光伏总装机容量（KVA）
+     */
+    private Float totalC;
+
+    /**
+     * 分布式光伏用户数量
+     */
+    private Integer pvUsers;
+
+    /**
+     * 其他分布式电源装置容量
+     */
+    private Float powerPower;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+
+}

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

@@ -0,0 +1,56 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+@TableName("pv_substation")
+public class PvSubstation {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变电站表Id
+     */
+    private String id;
+
+    /**
+     * 所属单位Id
+     */
+    private String unitId;
+
+    /**
+     * 变电站名称
+     */
+    private String name;
+
+    /**
+     * 电压等级Id，字典表
+     */
+    private String scale;
+
+    /**
+     * 变电站总容量（MVA）(手动填写)
+     */
+    private Double totalCapacity;
+
+    /**
+     * 运维班组Code
+     */
+    private String teamCode;
+
+
+}

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

@@ -0,0 +1,124 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+@TableName("pv_ten_voltage")
+public class PvTenVoltage extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 线路表Id
+     */
+    private String id;
+
+    /**
+     * 调度表Id（外键）
+     */
+    private String dispatchId;
+
+
+    /**
+     * 线路名称
+     */
+    private String name;
+
+    /**
+     * 跨区域类型
+     */
+    private String crType;
+
+    /**
+     * 电压等级Id，字典表
+     */
+    private String scale;
+
+    /**
+     * 设计电压等级Id，字典表
+     */
+    private String designScale;
+
+    /**
+     * 设备状态
+     */
+    private Integer devStatus;
+
+    /**
+     * 是否接地极(0:false;1:true)
+     */
+    private Boolean earthing;
+
+    /**
+     * 线路性质
+     */
+    private String quality;
+
+    /**
+     * 所属主线
+     */
+    private String masterStroke;
+
+    /**
+     * 专业分类
+     */
+    private String major;
+
+    /**
+     * 设备主人
+     */
+    private String master;
+
+    /**
+     * 起点电站
+     */
+    private String startStation;
+
+    /**
+     * 终点电站
+     */
+    private String endStation;
+
+    /**
+     * 运行负载限额
+     */
+    private Float runLoad;
+
+    /**
+     * 额定输出功率
+     */
+    private Float outputPower;
+
+    /**
+     * 最大允许电流
+     */
+    private Float maxCurrent;
+
+    /**
+     * 投运日期
+     */
+    private LocalDateTime putIntoDate;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+
+
+}

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

@@ -0,0 +1,45 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Getter
+@Setter
+@TableName("pv_unit")
+public class PvUnit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位表Id
+     */
+    private String id;
+
+    /**
+     * 父节点（0为根节点）
+     */
+    private String pid;
+
+    /**
+     * 单位名称
+     */
+    private String name;
+
+    /**
+     * 单位编码
+     */
+    private String code;
+
+
+}

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

@@ -0,0 +1,52 @@
+package com.njcn.device.pojo.po.pv;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-07-05
+ */
+@Data
+@TableName("pv_voltage")
+public class PvVoltage {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 母线序号
+     */
+    private String id;
+
+
+    /**
+     * 母线名称
+     */
+    private String name;
+
+    /**
+     * 母线号（在同一台设备中的电压通道号）
+     */
+    private Integer num;
+
+    /**
+     * 电压等级Id，字典表
+     */
+    private String scale;
+
+    /**
+     * 母线模型（0：虚拟母线；1：实际母线）默认是实际母线
+     */
+    private Integer model;
+
+
+}

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

@@ -26,7 +26,7 @@ public class VersionVO implements Serializable {
     /**
      * 装置系列(终端类型),字典表
      */
-    @ApiModelProperty("装置系列(终端类型)")
+    @ApiModelProperty("装置系列(终端型号)")
     private String devType;
 
     /**

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

@@ -0,0 +1,25 @@
+package com.njcn.device.pojo.vo.pv;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/7
+ */
+@Data
+public class UnitTreeVO {
+
+    private String id;
+
+    private String pid;
+
+    private String name;
+
+    private String code;
+
+    private List<UnitTreeVO> children;
+}