diff --git 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 index 1a0d651a0..73380019a 100644 --- 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 diff --git 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 index 632afe2fb..b1949e100 100644 --- 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 diff --git 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 index 02985317f..364f6c1c2 100644 --- 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 diff --git 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 deleted file mode 100644 index 51ddd9bf7..000000000 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageD.java +++ /dev/null @@ -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; -} \ No newline at end of file diff --git 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 index e419fb370..b00115211 100644 --- 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 diff --git 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 index 2ba3c7917..74b68c035 100644 --- 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 diff --git 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 index 3192d07eb..b9d015422 100644 --- 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 diff --git 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 index d864cb917..61b43b1e9 100644 --- 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 diff --git 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 index e394f5328..f16606536 100644 --- 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; /** * 四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁) diff --git 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 index e895fbfae..fcf45ea0f 100644 --- 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; /** * 四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁) diff --git 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 index a6ecd51cc..037f5bb26 100644 --- 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; /** * 四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁) diff --git 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 deleted file mode 100644 index 56fafcf58..000000000 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAreaAlarmCountM.java +++ /dev/null @@ -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; - -} diff --git 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 index bcd54b094..b52d9b877 100644 --- 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; } diff --git 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 index 2da62801e..249b7cf4e 100644 --- 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 diff --git 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 index 8d6c4737f..817648a42 100644 --- 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 diff --git 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 index b366c9d7b..3f0f69514 100644 --- 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 diff --git 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 index 99365446d..8a5172019 100644 --- 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 diff --git 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 index 0f9328f9d..b44d8d17b 100644 --- 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; /** * 在线监测点数 diff --git 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 index 1dcf57fef..29f0e2520 100644 --- 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; /** * 有效监测点数量 diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java index 9383d28cd..2c15c1d4f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java @@ -2,9 +2,13 @@ package com.njcn.prepare.executor; import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; +import com.njcn.prepare.bo.CalculatedParam; +import com.njcn.prepare.harmonic.service.mysql.area.RStatHarmonicOrgService; +import com.njcn.prepare.harmonic.service.mysql.area.RStatHarmonicService; +import com.njcn.prepare.harmonic.service.mysql.area.RStatHarmonicVoltageService; import com.njcn.prepare.harmonic.service.mysql.area.RStatOrgService; import com.njcn.prepare.harmonic.service.mysql.line.PollutionService; -import com.njcn.prepare.harmonic.service.mysql.newalgorithm.ROperatingIndexService; +import com.njcn.prepare.harmonic.service.mysql.newalgorithm.*; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; @@ -28,6 +32,16 @@ public class OrgPointExecutor extends BaseExecutor{ private final PollutionService pollutionService; + private final RStatHarmonicService rStatHarmonicService; + private final RStatHarmonicVoltageService rStatHarmonicVoltageService; + private final RStatHarmonicOrgService rstatHarmonicOrgService; + private final RStatEventService rStatEventDService; + private final RStatEventVoltageService rStatEventVoltageService; + private final RStatEventOrgService rStatEventOrgService; + private final RStatLoadTypeService rStatLoadTypeService; + + private final RAlarmCountService rAlarmCountService; + /** * @@ -132,4 +146,263 @@ public class OrgPointExecutor extends BaseExecutor{ } } } + + + /** + * + * 3.4.4. 单位监测点稳态指标统计-监测点类别（对象类型） + */ + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rStatHarmonic", nodeType = NodeTypeEnum.COMMON) + public boolean processRStatHarmonicAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rStatHarmonic", nodeType = NodeTypeEnum.COMMON) + public void processRStatHarmonicProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); + CalculatedParam calculatedParam = bindCmp.getRequestData(); + if (tag.equalsIgnoreCase("r_stat_harmonic_d")) { + //日表 + rStatHarmonicService.handleDay(calculatedParam); + } else if (tag.equalsIgnoreCase("r_stat_harmonic_m")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + rStatHarmonicService.handleMonth(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_harmonic_q")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //季表 + rStatHarmonicService.handleQtr(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_harmonic_y")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //年表 + rStatHarmonicService.handleYear(calculatedParam); + } + } + } + + /** + * + * 3.4.5. 单位监测点稳态指标统计-电压等级 + */ + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rStatHarmonicVoltage", nodeType = NodeTypeEnum.COMMON) + public boolean processRStatHarmonicVoltageAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rStatHarmonicVoltage", nodeType = NodeTypeEnum.COMMON) + public void processRStatHarmonicVoltageProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); + CalculatedParam calculatedParam = bindCmp.getRequestData(); + if (tag.equalsIgnoreCase("r_stat_harmonic_voltage_d")) { + //日表 + rStatHarmonicVoltageService.handleDay(calculatedParam); + } else if (tag.equalsIgnoreCase("r_stat_harmonic_voltage_m")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + rStatHarmonicVoltageService.handleMonth(calculatedParam); + } + } + } + + + + /** + * + * 3.4.4. 单位监测点稳态指标统计-监测点类别（对象类型） + */ + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rStatHarmonicOrg", nodeType = NodeTypeEnum.COMMON) + public boolean processRStatHarmonicOrgAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rStatHarmonicOrg", nodeType = NodeTypeEnum.COMMON) + public void processRStatHarmonicOrgProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); + CalculatedParam calculatedParam = bindCmp.getRequestData(); + if (tag.equalsIgnoreCase("r_stat_harmonic_org_d")) { + //日表 + rstatHarmonicOrgService.handleDay(calculatedParam); + } else if (tag.equalsIgnoreCase("r_stat_harmonic_org_m")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + rstatHarmonicOrgService.handleMonth(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_harmonic_org_q")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //季表 + rstatHarmonicOrgService.handleQtr(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_harmonic_org_y")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //年表 + rstatHarmonicOrgService.handleYear(calculatedParam); + } + } + } + + /** + * 3.4.6. 单位监测点暂态指标统计-监测点类别（对象类型） + */ + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rStatEvent", nodeType = NodeTypeEnum.COMMON) + public boolean processRStatEventAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rStatEvent", nodeType = NodeTypeEnum.COMMON) + public void processRStatEventProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); + CalculatedParam calculatedParam = bindCmp.getRequestData(); + if (tag.equalsIgnoreCase("r_stat_event_d")) { + //日表 + rStatEventDService.handleDay(calculatedParam); + } else if (tag.equalsIgnoreCase("r_stat_event_m")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + rStatEventDService.handleMonth(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_event_q")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //季表 + rStatEventDService.handleQtr(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_event_y")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //年表 + rStatEventDService.handleYear(calculatedParam); + } + } + } + + /** + * 3.4.7. 单位监测点暂态指标统计-电压等级 + */ + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rStatEventVoltage", nodeType = NodeTypeEnum.COMMON) + public boolean processRStatEventVoltageAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rStatEventVoltage", nodeType = NodeTypeEnum.COMMON) + public void processRStatEventVoltageProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); + CalculatedParam calculatedParam = bindCmp.getRequestData(); + if (tag.equalsIgnoreCase("r_stat_event_voltage_d")) { + //日表 + rStatEventVoltageService.handleDay(calculatedParam); + } else if (tag.equalsIgnoreCase("r_stat_event_voltage_m")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + rStatEventVoltageService.handleMonth(calculatedParam); + } + } + } + + + /** + * 3.4.9. 单位暂态指标数据统计 + */ + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rStatEventOrg", nodeType = NodeTypeEnum.COMMON) + public boolean processRStatEventOrgAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rStatEventOrg", nodeType = NodeTypeEnum.COMMON) + public void processRStatEventOrgProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); + CalculatedParam calculatedParam = bindCmp.getRequestData(); + if (tag.equalsIgnoreCase("r_stat_event_org_d")) { + //日表 + rStatEventOrgService.handleDay(calculatedParam); + } else if (tag.equalsIgnoreCase("r_stat_event_org_m")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + rStatEventOrgService.handleMonth(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_event_org_q")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //季表 + rStatEventOrgService.handleQtr(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_event_org_y")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //年表 + rStatEventOrgService.handleYear(calculatedParam); + } + } + } + + /** + * 3.4.12. 单位干扰源电流类指标超标统计 + */ + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rStatEventLoadType", nodeType = NodeTypeEnum.COMMON) + public boolean processRStatEventLoadTypeAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rStatEventLoadType", nodeType = NodeTypeEnum.COMMON) + public void processRStatEventLoadTypeProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); + CalculatedParam calculatedParam = bindCmp.getRequestData(); + if (tag.equalsIgnoreCase("r_stat_load_type_d")) { + //日表 + rStatLoadTypeService.handleDay(calculatedParam); + } else if (tag.equalsIgnoreCase("r_stat_load_type_m")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + rStatLoadTypeService.handleMonth(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_load_type_q")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //季表 + rStatLoadTypeService.handleQtr(calculatedParam); + } + }else if (tag.equalsIgnoreCase("r_stat_load_type_y")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //年表 + rStatLoadTypeService.handleYear(calculatedParam); + } + } + } + + /** + *3.4.14. 单位指标告警统计 + */ + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rStatAlarmCount", nodeType = NodeTypeEnum.COMMON) + public boolean processRStatAlarmCountAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rStatAlarmCount", nodeType = NodeTypeEnum.COMMON) + public void processRStatAlarmCountProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); + CalculatedParam calculatedParam = bindCmp.getRequestData(); + if (tag.equalsIgnoreCase("r_stat_alarm_count_w")) { + //周表 + rAlarmCountService.handleDay(calculatedParam); + } else if (tag.equalsIgnoreCase("r_stat_area_alarm_count_m")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + rAlarmCountService.handleMonth(calculatedParam); + } + } + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RStatOrgDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RStatOrgDMapper.xml index 285ad9084..b2d9769db 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RStatOrgDMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RStatOrgDMapper.xml @@ -23,7 +23,7 @@