1.分布式光伏台账相关

2022-07-13 09:04:57 +08:00
parent d00bd4bf0c
commit 63ce5e649c
36 changed files with 1072 additions and 103 deletions
--- a/pqs-device/device-api/src/main/java/com/njcn/device/enums/LineBaseEnum.java
+++ b/pqs-device/device-api/src/main/java/com/njcn/device/enums/LineBaseEnum.java
@@ -24,7 +24,20 @@ public enum LineBaseEnum {
    DEVICE_LEVEL(4, "设备"),
    SUB_V_LEVEL(5, "母线"),
    LINE_LEVEL(6, "监测点"),
-    INVALID_LEVEL(-1, "非法拓扑等级");
+    INVALID_LEVEL(-1, "非法拓扑等级"),
+
+
+
+    /**
+     * 分布式光伏树层级
+     */
+    PV_UNIT_LEVEL(0,"单位"),
+    PV_SUB_LEVEL(1,"变电站"),
+    PV_SUB_AREA_LEVEL(2,"台区")
+
+
+
+    ;

    private final Integer code;
    private final String message;
--- a/pqs-device/device-api/src/main/java/com/njcn/device/enums/PvDeviceResponseEnum.java
+++ b/pqs-device/device-api/src/main/java/com/njcn/device/enums/PvDeviceResponseEnum.java
@@ -20,16 +20,20 @@ public enum PvDeviceResponseEnum {
    VOLTAGE_REPEAT("A0352","母线名称重复"),
    SUB_AREA_REPEAT("A0353","台区名称重复"),
    SUB_NUM_REPEAT("A0354","母线号重复"),
-
+    DVE_CODE_REPEAT("A0355","终端编号重复"),
+    USER_CODE_REPEAT("A0356","用户编号重复"),
+    SUB_AREA_EMPTY("A0357","台区不能为空"),


    TEN_VOLTAGE_NULL("A0360","未查询到指定10kV线路"),
    UNIT_NULL("A0361","未查询到指定单位"),
    SUB_AREA_NULL("A0362","未查询到指定台区"),
-    DEV_NULL("A0363","未查询到指定终端")
-
-
-
+    DEV_NULL("A0363","未查询到指定终端"),
+    SUBSTATION_NULL("A0364","未查询到指定变电站"),
+    VOLTAGE_NULL("A0365","未查询到指定母线"),
+    DEV_NUM_NULL("A0366","当前装置监测点序号已存在"),
+    ONE_SUB_VOLTAGE_EMPTY("A0367","I类监测点变电站母线不可为空"),
+    TWO_SUB_VOLTAGE_EMPTY_MUST("A0368","II类监测点变电站母线必须为空"),

    ;

--- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLineDetailParam.java
+++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLineDetailParam.java
@@ -4,11 +4,14 @@ 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 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.LocalDateTime;
@@ -27,200 +30,245 @@ public class PvLineDetailParam implements Serializable {
    private static final long serialVersionUID = 1L;


+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "name",value = "监测点名称",required = true)
+    @NotBlank(message = "监测点名称不能为空")
+    private String name;
+
+    /**
+     * 监测点编号
+     */
+    @ApiModelProperty(name = "code",value = "监测点编号",required = true)
+    @NotBlank(message = "监测点编号不能为空")
+    private String code;

    /**
     * 所属终端
     */
-    @ApiModelProperty(name = "",value = "",required = true)
+    @ApiModelProperty(name = "devId",value = "所属终端",required = true)
+    @NotBlank(message = "所属终端id不能为空")
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "所属终端id违规")
    private String devId;

    /**
     * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
     */
-    @ApiModelProperty(name = "",value = "",required = true)
+    @ApiModelProperty(name = "type",value = "监测点类型（I类监测点、II类监测点、III类监测点），字典表",required = true)
+    @NotBlank(message = "监测点类型不能为空")
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "监测点类型违规")
    private String type;

    /**
     * 所属变电站（I类监测点）
     */
-    @ApiModelProperty(name = "",value = "",required = true)
+    @ApiModelProperty(name = "substationId",value = "所属变电站（I类监测点）")
    private String substationId;

    /**
     * 所属母线名称（I类监测点）
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "voltageId",value = "所属母线名称（I类监测点）")
    private String voltageId;

    /**
     * 所属台区ID（II类监测点）
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "subAreaId",value = "所属台区ID（II类监测点）")
    private String subAreaId;

    /**
-     * 所属分布式光伏台账（III类监测点）
+     * 用户编号
     */
-    @ApiModelProperty(name = "",value = "")
-    private String distributedId;
+    @ApiModelProperty(name = "userCode",value = "用户编号")
+    @NotBlank(message = "用户编号不能为空")
+    private String userCode;
+

    /**
-     * 所属低压用户台账（III类监测点）
+     * 电压等级
     */
-    @ApiModelProperty(name = "",value = "")
-    private String lvUserId;
+    @ApiModelProperty(name = "scale",value = "电压等级")
+    private String scale;

    /**
     * 线路号（在同一台设备中的监测点号）
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "num",value = "线路号（在同一台设备中的监测点号）")
+    @NotNull(message = "线路号不可为空")
+    @Range(min = 1,max = 10,message = "线路号违规")
    private Integer num;

    /**
     * PT一次变比
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "PT一次变比不可为空")
+    @ApiModelProperty(name = "pt1",value = "PT一次变比")
    private Float pt1;

    /**
     * PT二次变比
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "PT二次变比不可为空")
+    @ApiModelProperty(name = "pt2",value = "PT二次变比")
    private Float pt2;

    /**
     * CT一次变比
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "CT一次变比不可为空")
+    @ApiModelProperty(name = "ct1",value = "CT一次变比")
    private Float ct1;

    /**
     * CT二次变比
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "CT二次变比不可为空")
+    @ApiModelProperty(name = "ct2",value = "CT二次变比")
    private Float ct2;

    /**
     * 设备容量
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "设备容量不可为空")
+    @ApiModelProperty(name = "devCapacity",value = "设备容量")
    private Float devCapacity;

    /**
     * 短路容量
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "短路容量不可为空")
+    @ApiModelProperty(name = "shortCapacity",value = "短路容量")
    private Float shortCapacity;

    /**
     * 基准容量
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "基准容量不可为空")
+    @ApiModelProperty(name = "standardCapacity",value = "基准容量")
    private Float standardCapacity;

    /**
     * 协议容量
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "协议容量不可为空")
+    @ApiModelProperty(name = "dealCapacity",value = "协议容量")
    private Float dealCapacity;

    /**
     * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "接线类型不可为空")
+    @ApiModelProperty(name = "ptType",value = "接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)")
+    @Range(min = 0,max = 2,message = "接线类型违规")
    private Integer ptType;

    /**
     * 测量间隔（1-10分钟）
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "测量间隔不可为空")
+    @ApiModelProperty(name = "timeInterval",value = "测量间隔（1-10分钟）")
+    @Range(min = 1,max = 10,message = "测量间隔（1-10分钟）")
    private Integer timeInterval;

    /**
     * 干扰源类型,字典表
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "干扰源类型不可为空")
+    @ApiModelProperty(name = "loadType",value = "干扰源类型,字典表")
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "干扰源类型id违规")
    private String loadType;

    /**
     * 行业类型，字典表
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "行业类型不可为空")
+    @ApiModelProperty(name = "businessType",value = "行业类型，字典表")
+    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "行业类型id违规")
    private String businessType;

    /**
     * 网公司谐波监测平台标志(0-否;1-是)，默认否
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "网公司谐波监测平台标志不可为空")
+    @ApiModelProperty(name = "monitorFlag",value = "网公司谐波监测平台标志(0-否;1-是)，默认否")
+    @Range(min = 0,max = 1,message = "网公司谐波监测平台标志违规")
    private Integer monitorFlag;

    /**
     * 电网标志（0-电网侧；1-非电网侧）
     */
-    @ApiModelProperty(name = "",value = "")
+    @NotNull(message = "电网标志不可为空")
+    @ApiModelProperty(name = "powerFlag",value = "电网标志（0-电网侧；1-非电网侧）")
+    @Range(min = 0,max = 1,message = "电网标志违规")
    private Integer powerFlag;

    /**
     * 国网谐波监测平台监测点号
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "monitorId",value = "国网谐波监测平台监测点号")
    private String monitorId;

    /**
     * 监测点对象名称
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "objName",value = "监测点对象名称")
    private String objName;

    /**
     * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
     */
-    @ApiModelProperty(name = "",value = "")
-    private Integer statFlag;
+    @NotNull(message = "人为干预是否参与统计标志不可为空")
+    @ApiModelProperty(name = "statFlag",value = "人为干预是否参与统计（0：不参与，1：参与）默认参与统计")
+    @Range(min = 0,max = 1,message = "为干预是否参与统计违规")
+    private Integer statFlag = 1;

    /**
     * 备注
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "remark",value = "备注")
    private String remark;

    /**
     * 电压互感器类型，字典表
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "tfType",value = "电压互感器类型，字典表")
    private String tfType;

    /**
     * 所属变压器编号
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "tfCode",value = "所属变压器编号")
    private String tfCode;

    /**
     * 中性点接地方式，字典表
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "groundType",value = "中性点接地方式，字典表")
    private String groundType;

    /**
     * 投运日期
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "putIn",value = "投运日期")
+    @DateTimeStrValid(message = "投运日期格式有误")
    private String putIn;

    /**
     * 接入日期
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "access",value = "接入日期")
+    @DateTimeStrValid(message = "接入日期格式有误")
    private String access;

    /**
     * 是否专项供电（0：否，1：是）默认参与统计
     */
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "powerSupply",value = "是否专项供电（0：否，1：是）默认参与统计")
    private Integer powerSupply;

-   
+

    @Data
    @EqualsAndHashCode(callSuper = true)
--- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTerminalBaseQuery.java
+++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTerminalBaseQuery.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 javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PvTerminalBaseQuery extends BaseParam {
+
+    @ApiModelProperty(name = "id",value = "单位变电站台区索引",required = true)
+    @NotEmpty(message = "单位变电站台区索引不能为空")
+    private List<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;
+}
--- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLineDetail.java
+++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLineDetail.java
@@ -3,6 +3,7 @@ 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;
@@ -30,6 +31,10 @@ public class PvLineDetail extends BaseEntity {
     */
    private String id;

+    private String name;
+
+    private String code;
+
    /**
     * 所属终端
     */
@@ -55,15 +60,12 @@ public class PvLineDetail extends BaseEntity {
     */
    private String subAreaId;

-    /**
-     * 所属分布式光伏台账（III类监测点）
-     */
-    private String distributedId;
+    private String userCode;

    /**
-     * 所属低压用户台账（III类监测点）
+     * 电压等级
     */
-    private String lvUserId;
+    private String scale;

    /**
     * 线路号（在同一台设备中的监测点号）
@@ -178,12 +180,12 @@ public class PvLineDetail extends BaseEntity {
    /**
     * 投运日期
     */
-    private LocalDateTime putIn;
+    private LocalDate putIn;

    /**
     * 接入日期
     */
-    private LocalDateTime access;
+    private LocalDate access;

    /**
     * 是否专项供电（0：否，1：是）默认参与统计
--- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLineAllDetailVO.java
+++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLineAllDetailVO.java
@@ -0,0 +1,203 @@
+package com.njcn.device.pojo.vo.pv;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/7/12
+ */
+@Data
+public class PvLineAllDetailVO {
+
+
+        /**
+         * 监测点序号
+         */
+        private String id;
+
+        private String name;
+
+        private String code;
+
+        /**
+         * 所属终端
+         */
+        private String devName;
+
+        /**
+         * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
+         */
+        private String type;
+
+        /**
+         * 所属变电站（I类监测点）
+         */
+        private String substationName;
+
+        /**
+         * 所属母线名称（I类监测点）
+         */
+        private String voltageName;
+
+        /**
+         * 所属台区ID（II类监测点）
+         */
+        private String subAreaName;
+
+        private String userCode;
+
+        /**
+         * 分布式光伏名称
+         */
+        private String distributeName;
+
+        /**
+         * 低压用户名称
+         */
+        private String lvUserName;
+
+
+        /**
+         * 电压等级
+         */
+        private String scale;
+
+        /**
+         * 线路号（在同一台设备中的监测点号）
+         */
+        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 LocalDate putIn;
+
+        /**
+         * 接入日期
+         */
+        private LocalDate access;
+
+        /**
+         * 是否专项供电（0：否，1：是）默认参与统计
+         */
+        private Integer powerSupply;
+
+        /**
+         * 状态
+         */
+        private Integer state;
+
+
+}
+
+