算法提交

2023-11-16 11:43:26 +08:00
parent 40fba020dd
commit 4e6a740696
40 changed files with 4250 additions and 374 deletions
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicDPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicDPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicDPO {
     * 生成数据的时间,每日统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 监测点类别ID、监测对象类型ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicMPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicMPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicMPO {
     * 生成数据的时间,每月统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 监测点类别ID、监测对象类型ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicQPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicQPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicQPO {
     * 生成数据的时间,每季度统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 监测点类别ID、监测对象类型ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageD.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageD.java
@@ -1,68 +0,0 @@
-package com.njcn.prepare.harmonic.pojo.mysql.po;
-
-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 java.util.Date;
-import lombok.Data;
-
-/**
- * 
- * Description:
- * Date: 2023/6/6  9:10【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-@TableName(value = "r_stat_harmonic_voltage_d")
-public class RStatHarmonicVoltageD {
-    /**
-     * 单位ID
-     */
-    @TableId(value = "org_no", type = IdType.ASSIGN_UUID)
-    private String orgNo;
-
-    /**
-     * 生成数据的时间,每月统计一次
-     */
-    @TableId(value = "data_date", type = IdType.ASSIGN_UUID)
-    private Date dataDate;
-
-    /**
-     * 监测对象类型ID
-     */
-    @TableId(value = "measurement_type_class", type = IdType.ASSIGN_UUID)
-    private String measurementTypeClass;
-
-    /**
-     * 稳态指标类型Id，字典表ID
-     */
-    @TableId(value = "harmonic_type", type = IdType.ASSIGN_UUID)
-    private String harmonicType;
-
-    /**
-     * 电压等级Id，字典表ID
-     */
-    @TableId(value = "voltage_type", type = IdType.ASSIGN_UUID)
-    private String voltageType;
-
-    /**
-     * 数据类型,字典表（01：主网测点  02：配网测点）
-     */
-    @TableId(value = "data_type", type = IdType.ASSIGN_UUID)
-    private String dataType;
-
-    /**
-     * 超标监测点数
-     */
-    @TableField(value = "over_limit_measurement_average")
-    private Integer overLimitMeasurementAverage;
-
-    /**
-     * 超标监测点数占比
-     */
-    @TableField(value = "over_limit_measurement_ratio_average")
-    private Float overLimitMeasurementRatioAverage;
-}
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageDPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageDPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicVoltageDPO {
     * 生成数据的时间,每月统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 监测对象类型ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageMPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageMPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicVoltageMPO {
     * 生成数据的时间,每月统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 监测对象类型ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicYPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicYPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicYPO {
     * 生成数据的时间,每季度统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 监测点类别ID、监测对象类型ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatLoadTypeDPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatLoadTypeDPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatLoadTypeDPO {
     * 生成数据的时间,每日统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁)，字典ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatLoadTypeMPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatLoadTypeMPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatLoadTypeMPO {
     * 生成数据的时间,每月统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁)
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatLoadTypeQPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatLoadTypeQPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatLoadTypeQPO {
     * 生成数据的时间,每季统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁)
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatLoadTypeYPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatLoadTypeYPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatLoadTypeYPO {
     * 生成数据的时间,每年统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁)
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAreaAlarmCountM.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAreaAlarmCountM.java
@@ -1,132 +0,0 @@
-package com.njcn.prepare.harmonic.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 区域告警统计(月)
- * @TableName r_stat_area_alarm_count_m
- */
-@Data
-@TableName("r_stat_area_alarm_count_m")
-public class RStatAreaAlarmCountM {
-
-    /**
-     * 单位ID
-     */
-    @MppMultiId(value = "org_no")
-    private String orgNo;
-
-    /**
-     * 生成数据的时间,每月统计一次
-     */
-    @MppMultiId(value = "data_date")
-    private Date dataDate;
-
-    /**
-     * 数据类型(0:主网 1:配网)
-     */
-    @MppMultiId(value = "data_type")
-    private String dataType;
-
-    /**
-     * 电压偏差告警情况(0:否 1:是)
-     */
-    @TableField(value = "vdev_alarm_info")
-    private Integer vdevAlarmInfo;
-
-    /**
-     * 电压偏差告警超标占比
-     */
-    @TableField(value = "vdev_alarm_ratio")
-    private Float vdevAlarmRatio;
-
-    /**
-     * 频率偏差告警情况(0:否 1:是)
-     */
-    @TableField(value = "freq_alarm_info")
-    private Integer freqAlarmInfo;
-
-    /**
-     * 频率偏差告警超标占比
-     */
-    @TableField(value = "freq_alarm_ratio")
-    private Float freqAlarmRatio;
-
-    /**
-     * 三相电压不平衡度告警情况(0:否 1:是)
-     */
-    @TableField(value = "unbalance_alarm_info")
-    private Integer unbalanceAlarmInfo;
-
-    /**
-     * 三相电压不平衡度告警超标占比
-     */
-    @TableField(value = "unbalance_alarm_ratio")
-    private Float unbalanceAlarmRatio;
-
-    /**
-     * 谐波电压告警情况(0:否 1:是)
-     */
-    @TableField(value = "v_alarm_info")
-    private Integer vAlarmInfo;
-
-    /**
-     * 谐波电压告警超标占比
-     */
-    @TableField(value = "v_alarm_ratio")
-    private Float vAlarmRatio;
-
-    /**
-     * 闪变告警情况(0:否 1:是)
-     */
-    @TableField(value = "flicker_alarm_info")
-    private Integer flickerAlarmInfo;
-
-    /**
-     * 闪变告警超标占比
-     */
-    @TableField(value = "flicker_alarm_ratio")
-    private Float flickerAlarmRatio;
-
-    /**
-     * 电压暂降告警情况(0:否 1:是)
-     */
-    @TableField(value = "sag_alarm_info")
-    private Integer sagAlarmInfo;
-
-    /**
-     * 电压暂降告警平均发生次数
-     */
-    @TableField(value = "sag_alarm_avg_count")
-    private Integer sagAlarmAvgCount;
-
-    /**
-     * 短时中断告警情况(0:否 1:是)
-     */
-    @TableField(value = "interrupt_alarm_info")
-    private Integer interruptAlarmInfo;
-
-    /**
-     * 短时中断告警平均发生次数
-     */
-    @TableField(value = "interrupt_alarm_avg_count")
-    private Integer interruptAlarmAvgCount;
-
-    /**
-     * 稳态指标评级结果（0 较差 1中等 2较好）
-     */
-    @TableField(value = "harmonic_type_grade")
-    private Integer harmonicTypeGrade;
-
-    /**
-     * 暂态指标评级结果（0 较差 1中等 2较好）
-     */
-    @TableField(value = "event_type_grade")
-    private Integer eventTypeGrade;
-
-}
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAreaAlarmCountMPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAreaAlarmCountMPO.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;

+import java.time.LocalDate;
 import java.util.Date;

 /**
@@ -25,7 +26,7 @@ public class RStatAreaAlarmCountMPO {
     * 生成数据的时间,每月统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 数据类型(0:主网 1:配网)
@@ -128,9 +129,9 @@ public class RStatAreaAlarmCountMPO {
     */
    @TableField(value = "event_type_grade")
    private Integer eventTypeGrade;
-
+    @TableField(exist = false)
    private Float wtCount;
-
+    @TableField(exist = false)
    private Float ztCount;

 }
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatHarmonicOrgDPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatHarmonicOrgDPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicOrgDPO {
     * 生成数据的时间,每日统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 稳态指标类型Id，字典表ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatHarmonicOrgMPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatHarmonicOrgMPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicOrgMPO {
     * 生成数据的时间,每月统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 稳态指标类型Id，字典表ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatHarmonicOrgQPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatHarmonicOrgQPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicOrgQPO {
     * 生成数据的时间,每季度统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 稳态指标类型Id，字典表ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatHarmonicOrgYPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatHarmonicOrgYPO.java
@@ -4,6 +4,8 @@ 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 java.time.LocalDate;
 import java.util.Date;

 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -30,7 +32,7 @@ public class RStatHarmonicOrgYPO {
     * 生成数据的时间,每年统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 稳态指标类型Id，字典表ID
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPwAlarmCountWPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPwAlarmCountWPO.java
@@ -6,6 +6,7 @@ import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;

 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;

 /**
@@ -26,7 +27,7 @@ public class RStatPwAlarmCountWPO {
     * 生成数据的时间,每周统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 在线监测点数
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatZwAlarmCountWPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatZwAlarmCountWPO.java
@@ -6,6 +6,7 @@ import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;

 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;

 /**
@@ -26,7 +27,7 @@ public class RStatZwAlarmCountWPO {
     * 生成数据的时间,每周统计一次
     */
    @MppMultiId(value = "data_date")
-    private Date dataDate;
+    private LocalDate dataDate;

    /**
     * 有效监测点数量