算法提交

2023-12-13 15:40:48 +08:00
parent e1f697f180
commit e5ca1cbd05
39 changed files with 1834 additions and 135 deletions
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ConverterDetailStatisticsDTO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ConverterDetailStatisticsDTO.java
@@ -17,44 +17,42 @@ public class ConverterDetailStatisticsDTO {

    /*主键 是否必填：是*/
    private String id;
-    /*发生超标或暂态母线日均占比（%） 是否必填：否*/
-    private BigDecimal abnormalBusAvgRate;
-    /*发生超标或暂态母线数量（条） 是否必填：是*/
-    private Integer abnormalBusNum;
-    /*发生超标或暂态母线占比（%） 是否必填：否*/
-    private BigDecimal abnormalBusRate;
-    /*发生超标或暂态换流站日均占比（%） 是否必填：否*/
-    private BigDecimal abnormalConverterAvgRate;
-    /*发生超标或暂态换流站数量（条） 是否必填：否*/
-    private Integer abnormalConverterNum;
-    /*发生超标或暂态换流站占比（%） 是否必填：否*/
-    private BigDecimal abnormalConverterRate;
-    /*市级单位id 是否必填：是*/
-    private String cityId;
-    /*市级单位名称 是否必填：否*/
-    private String cityName;
-    /*监测交流母线数量（条） 是否必填：否*/
-    private Integer monitorAlternatingBusNum;
-    /*交流母线监测率（%） 是否必填：否*/
-    private BigDecimal monitorAlternatingBusRate;
-    /*监测换流站数量（座） 是否必填：是*/
-    private Integer monitorConverterNum;
-    /*换流站监测率（%） 是否必填：*/
-    private BigDecimal monitorConverterRate;
-    /*在运交流母线数量（条） 是否必填：是*/
-    private Integer onlineAlternatingBusNum;
-    /*在运换流站数量（座） 是否必填：是*/
-    private Integer onlineConverterNum;
+
    /*省级单位名称 是否必填：否*/
    private String provinceName;
    /*省级单位id 是否必填：是*/
    private String provinceId;
+
+    /*市级单位id 是否必填：是*/
+    private String cityId;
+    /*市级单位名称 是否必填：否*/
+    private String cityName;
+
+
+
    /*统计日期 是否必填：是*/
    private String statisticalDate;
    /*统计类型 是否必填：是*/
    private String statisticalType;
+
    /*统计层级 是否必填：是*/
    private String statisticalLevel;
+
+
+    /*在运交流母线数量（条） 是否必填：是*/
+    private Integer onlineAlternatingBusNum;
+    /*在运换流站数量（座） 是否必填：是*/
+    private Integer onlineConverterNum;
+
+    /*发生超标或暂态母线数量（条） 是否必填：是*/
+    private Integer abnormalBusNum;
+
+
+    /*监测换流站数量（座） 是否必填：是*/
+    private Integer monitorConverterNum;
+    /*监测交流母线数量（条） 是否必填：否*/
+    private Integer monitorAlternatingBusNum;
+
    /*累计发生超标或暂态换流站数量（座） 是否必填：否*/
    private Integer abnormalConverterCount;
    /*累计监测换流站数量（座） 是否必填：否*/
@@ -66,4 +64,33 @@ public class ConverterDetailStatisticsDTO {



+
+    /*发生超标或暂态换流站数量（条） 是否必填：否*/
+    private Integer abnormalConverterNum;
+
+    /*发生超标或暂态母线日均占比（%） 是否必填：否*/
+    private BigDecimal abnormalBusAvgRate;
+
+    /*发生超标或暂态母线占比（%） 是否必填：否*/
+    private BigDecimal abnormalBusRate;
+    /*发生超标或暂态换流站日均占比（%） 是否必填：否*/
+    private BigDecimal abnormalConverterAvgRate;
+
+    /*发生超标或暂态换流站占比（%） 是否必填：否*/
+    private BigDecimal abnormalConverterRate;
+
+
+    /*交流母线监测率（%） 是否必填：否*/
+    private BigDecimal monitorAlternatingBusRate;
+
+    /*换流站监测率（%） 是否必填：*/
+    private BigDecimal monitorConverterRate;
+
+
+
+
+
+
+
+
 }
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/PqTypicalSourceCreateDTO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/PqTypicalSourceCreateDTO.java
@@ -0,0 +1,100 @@
+package com.njcn.harmonic.pojo.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Description:
+ * Date: 2023/12/12  14:40【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class PqTypicalSourceCreateDTO {
+
+    /*唯一标识	uuid是否必填：是*/
+    private	String	id;
+
+    /*统计日期	年yyyy，月yyyy-MM，日yyyy-MM-dd是否必填：是*/
+    private	String	statisticalDate;
+    /*统计层级	见3.20是否必填：是*/
+    private	String	statisticalLevel;
+    /*统计类型	见3.19是否必填：是*/
+    private	String	statisticalType;
+    /*指标类型	见3.18是否必填：是*/
+    private	String	indexType;
+
+    /*所属网省id	取ISC平台上的组织id是否必填：是*/
+    private	String	provinceId;
+    /*所属网省名称	取ISC平台上的组织名称是否必填：是*/
+    private	String	provinceName;
+    /*所属地市id	取ISC平台上的组织id是否必填：*/
+    private	String	cityId;
+    /*所属地市名称	取ISC平台上的组织名称是否必填：*/
+    private	String	cityName;
+    /*所属区县id	取ISC平台上的组织id是否必填：*/
+    private	String	countyId;
+    /*所属区县名称	取ISC平台上的组织名称是否必填：*/
+    private	String	countyName;
+
+    /*行业分类	见3.21，当典型源荷为“其他干扰源”的时候为必填。是否必填：*/
+    private	String	industryType;
+    /*干扰源数量	是否必填：是*/
+    private	Integer	interferenceSourceNum;
+
+
+    /*闪变平均超占比	存放百分比是否必填：是*/
+    private	BigDecimal	flickerAvgOvRate;
+    /*闪变超标数	是否必填：是*/
+    private	Integer	flickerOvNum;
+    /*闪变超标占比	是否必填：是*/
+    private	BigDecimal	flickerOvRate;
+
+
+    /*谐波电流平均超标占比	是否必填：是*/
+    private	BigDecimal	iAvgOvRate;
+    /*谐波电流超标数	是否必填：是*/
+    private	Integer	iOvNum;
+    /*谐波电流超标占比	是否必填：是*/
+    private	BigDecimal	iOvRate;
+
+    /*负序电流平均超标占比	是否必填：是*/
+    private	BigDecimal	inseqAvgOvRate;
+    /*负序电流超标数	是否必填：是*/
+    private	Integer	inseqOvNum;
+    /*负序电流超标占比	是否必填：是*/
+    private	BigDecimal	inseqOvRate;
+
+
+
+    /*三相不平衡超标数	是否必填：是*/
+    private	Integer	unbanOvNum;
+    /*三相不平衡超标占比	是否必填：是*/
+    private	BigDecimal	unbanOvRate;
+    /*三相不平衡平均超标占比	是否必填：是*/
+    private BigDecimal unbanAvgOvRate;
+
+    /*谐波电压平均超标占比	是否必填：是*/
+    private	BigDecimal	vAvgOvRate;
+    /*谐波电压超标数	是否必填：是*/
+    private	Integer	vOvNum;
+    /*谐波电压超标占比	是否必填：是*/
+    private	BigDecimal	vOvRate;
+
+    /*实现监测数量	是否必填：是*/
+    private	Integer	monitorNum;
+    /*监测率	是否必填：是*/
+    private	BigDecimal	monitoringRate;
+    /*超标数	是否必填：是*/
+    private	Integer	ovNum;
+    /*超标占比	是否必填：是*/
+    private	BigDecimal	ovRate;
+
+    /*累计超标天数合计	是否必填：*/
+    private	Integer	ovDayCount;
+    /*平均超标天数	当统计类型是月数据、年数据时必填是否必填：*/
+    private	BigDecimal	averageOvDays;
+
+}
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/SubstationQualityStatisticsDTO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/SubstationQualityStatisticsDTO.java
@@ -38,6 +38,8 @@ public class SubstationQualityStatisticsDTO {
    private  String  converterId;
    /*换流站名称  是否必填：是*/
    private  String  converterName;
+    /*电压等级  是否必填：是*/
+    private  String  voltageLevel;

    /*母线id  是否必填：否*/
    private  String  busId;
@@ -51,8 +53,13 @@ public class SubstationQualityStatisticsDTO {

    /*站内有效监测点数量（个）  是否必填：是*/
    private  Integer  effectiveMonitorNum;
+    /*谐波电压超标天数  是否必填：否*/
+    private  Integer  harmvOvDay;
+    /*当年累计月数  是否必填：否*/
+    private  Integer  monthsCount;
    /*月均超标天数  是否必填：否*/
    private  BigDecimal  monthOvDays;
+
    /*奇次谐波电压限值（%）  是否必填：是*/
    private  BigDecimal  oddVoltLimit;
    /*累计超标天数  是否必填：否*/
@@ -71,18 +78,13 @@ public class SubstationQualityStatisticsDTO {
    private  BigDecimal  v5;
    /*7次谐波电压95%概率值（%）  是否必填：否*/
    private BigDecimal  v7;
-    /*电压等级  是否必填：是*/
-    private  String  voltageLevel;
+
    /*电压总谐波畸变率95%概率值统计值（%）  是否必填：否*/
    private  BigDecimal  vthd;
    /*电压总谐波畸变率95%概率值限值（%）  是否必填：是*/
    private  BigDecimal  vthdLimit;

-    /*谐波电压超标天数  是否必填：否*/
-    private  Integer  harmvOvDay;

-    /*当年累计月数  是否必填：否*/
-    private  Integer  monthsCount;



--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterdetailstatisticsPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterdetailstatisticsPO.java
@@ -0,0 +1,93 @@
+package com.njcn.harmonic.pojo.po.send;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/12/11  11:35【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "converterdetailstatistics")
+public class ConverterdetailstatisticsPO {
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    @TableField(value = "abnormalBusAvgRate")
+    private BigDecimal abnormalBusAvgRate;
+
+    @TableField(value = "abnormalBusNum")
+    private Integer abnormalBusNum;
+
+    @TableField(value = "abnormalBusRate")
+    private BigDecimal abnormalBusRate;
+
+    @TableField(value = "abnormalConverterAvgRate")
+    private BigDecimal abnormalConverterAvgRate;
+
+    @TableField(value = "abnormalConverterNum")
+    private Integer abnormalConverterNum;
+
+    @TableField(value = "abnormalConverterRate")
+    private BigDecimal abnormalConverterRate;
+
+    @TableField(value = "cityId")
+    private String cityId;
+
+    @TableField(value = "cityName")
+    private String cityName;
+
+    @TableField(value = "monitorAlternatingBusNum")
+    private Integer monitorAlternatingBusNum;
+
+    @TableField(value = "monitorAlternatingBusRate")
+    private BigDecimal monitorAlternatingBusRate;
+
+    @TableField(value = "monitorConverterNum")
+    private Integer monitorConverterNum;
+
+    @TableField(value = "monitorConverterRate")
+    private BigDecimal monitorConverterRate;
+
+    @TableField(value = "onlineAlternatingBusNum")
+    private Integer onlineAlternatingBusNum;
+
+    @TableField(value = "onlineConverterNum")
+    private Integer onlineConverterNum;
+
+    @TableField(value = "provinceName")
+    private String provinceName;
+
+    @TableField(value = "provinceId")
+    private String provinceId;
+
+    @TableField(value = "statisticalDate")
+    private String statisticalDate;
+
+    @TableField(value = "statisticalType")
+    private String statisticalType;
+
+    @TableField(value = "statisticalLevel")
+    private String statisticalLevel;
+
+    @TableField(value = "abnormalConverterCount")
+    private Integer abnormalConverterCount;
+
+    @TableField(value = "monitorConverterCount")
+    private Integer monitorConverterCount;
+
+    @TableField(value = "abnormalBusCount")
+    private Integer abnormalBusCount;
+
+    @TableField(value = "monitorAlternatingBusCount")
+    private Integer monitorAlternatingBusCount;
+}
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java
@@ -0,0 +1,123 @@
+package com.njcn.harmonic.pojo.po.send;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/12/12  15:16【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "pq_typical_source_create")
+public class PqTypicalSourceCreatePO {
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    @TableField(value = "statisticalDate")
+    private String statisticalDate;
+
+    @TableField(value = "statisticalLevel")
+    private String statisticalLevel;
+
+    @TableField(value = "statisticalType")
+    private String statisticalType;
+
+    @TableField(value = "indexType")
+    private String indexType;
+
+    @TableField(value = "provinceId")
+    private String provinceId;
+
+    @TableField(value = "provinceName")
+    private String provinceName;
+
+    @TableField(value = "cityId")
+    private String cityId;
+
+    @TableField(value = "cityName")
+    private String cityName;
+
+    @TableField(value = "countyId")
+    private String countyId;
+
+    @TableField(value = "countyName")
+    private String countyName;
+
+    @TableField(value = "industryType")
+    private String industryType;
+
+    @TableField(value = "interferenceSourceNum")
+    private Integer interferenceSourceNum;
+
+    @TableField(value = "averageOvDays")
+    private BigDecimal averageOvDays;
+
+    @TableField(value = "flickerAvgOvRate")
+    private BigDecimal flickerAvgOvRate;
+
+    @TableField(value = "flickerOvNum")
+    private Integer flickerOvNum;
+
+    @TableField(value = "flickerOvRate")
+    private BigDecimal flickerOvRate;
+
+    @TableField(value = "iAvgOvRate")
+    private BigDecimal iAvgOvRate;
+
+    @TableField(value = "iOvNum")
+    private Integer iOvNum;
+
+    @TableField(value = "iOvRate")
+    private BigDecimal iOvRate;
+
+    @TableField(value = "inseqAvgOvRate")
+    private BigDecimal inseqAvgOvRate;
+
+    @TableField(value = "inseqOvNum")
+    private Integer inseqOvNum;
+
+    @TableField(value = "inseqOvRate")
+    private BigDecimal inseqOvRate;
+
+    @TableField(value = "monitorNum")
+    private Integer monitorNum;
+
+    @TableField(value = "monitoringRate")
+    private BigDecimal monitoringRate;
+
+    @TableField(value = "ovNum")
+    private Integer ovNum;
+
+    @TableField(value = "ovRate")
+    private BigDecimal ovRate;
+
+    @TableField(value = "unbanOvNum")
+    private Integer unbanOvNum;
+
+    @TableField(value = "unbanOvRate")
+    private BigDecimal unbanOvRate;
+
+    @TableField(value = "vAvgOvRate")
+    private BigDecimal vAvgOvRate;
+
+    @TableField(value = "vOvNum")
+    private Integer vOvNum;
+
+    @TableField(value = "vOvRate")
+    private BigDecimal vOvRate;
+
+    @TableField(value = "unbanAvgOvRate")
+    private BigDecimal unbanAvgOvRate;
+
+    @TableField(value = "ovDayCount")
+    private Integer ovDayCount;
+}
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/SubstationQualityStatisticsPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/SubstationQualityStatisticsPO.java
@@ -0,0 +1,115 @@
+package com.njcn.harmonic.pojo.po.send;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/12/7  16:21【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "substation_quality_statistics")
+public class SubstationQualityStatisticsPO {
+
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    @TableField(value = "statisticalDate")
+    private String statisticalDate;
+
+    @TableField(value = "statisticalType")
+    private String statisticalType;
+
+    @TableField(value = "provinceId")
+    private String provinceId;
+
+    @TableField(value = "provinceName")
+    private String provinceName;
+
+    @TableField(value = "cityId")
+    private String cityId;
+
+    @TableField(value = "cityName")
+    private String cityName;
+
+    @TableField(value = "countyId")
+    private String countyId;
+
+    @TableField(value = "countyName")
+    private String countyName;
+
+    @TableField(value = "converterId")
+    private String converterId;
+
+    @TableField(value = "converterName")
+    private String converterName;
+
+    @TableField(value = "voltageLevel")
+    private String voltageLevel;
+
+    @TableField(value = "busId")
+    private String busId;
+
+    @TableField(value = "busName")
+    private String busName;
+
+    @TableField(value = "busVoltageLevel")
+    private String busVoltageLevel;
+
+    @TableField(value = "monitorId")
+    private String monitorId;
+
+    @TableField(value = "effectiveMonitorNum")
+    private Integer effectiveMonitorNum;
+
+    @TableField(value = "harmvOvDay")
+    private Integer harmvOvDay;
+
+    @TableField(value = "monthsCount")
+    private Integer monthsCount;
+
+    @TableField(value = "monthOvDays")
+    private BigDecimal monthOvDays;
+
+    @TableField(value = "oddVoltLimit")
+    private BigDecimal oddVoltLimit;
+
+    @TableField(value = "totalOvDays")
+    private Integer totalOvDays;
+
+    @TableField(value = "v11")
+    private BigDecimal v11;
+
+    @TableField(value = "v13")
+    private BigDecimal v13;
+
+    @TableField(value = "v23")
+    private BigDecimal v23;
+
+    @TableField(value = "v25")
+    private BigDecimal v25;
+
+    @TableField(value = "v3")
+    private BigDecimal v3;
+
+    @TableField(value = "v5")
+    private BigDecimal v5;
+
+    @TableField(value = "v7")
+    private BigDecimal v7;
+
+    @TableField(value = "vthd")
+    private BigDecimal vthd;
+
+    @TableField(value = "vthdLimit")
+    private BigDecimal vthdLimit;
+}