有功功率趋势定时任务算法完善

2024-09-05 14:17:11 +08:00
parent 9fca0e5714
commit 8e6f07330e
18 changed files with 772 additions and 183 deletions
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/PowerStatisticsParam.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/PowerStatisticsParam.java
@@ -16,44 +16,44 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
 public class PowerStatisticsParam extends BaseParam {

-    @ApiModelProperty(name = "lineId", value = "监测点ID")
+    @ApiModelProperty("监测点ID")
    @NotBlank(message = "监测点ID不能为空")
    private String lineId;

-    @ApiModelProperty(name = "statisticalId", value = "指标分类ID(用于查询指标详细数据的指标分类ID)")
+    @ApiModelProperty("指标分类ID(用于查询指标详细数据的指标分类ID)")
    private String statisticalId;

-    @ApiModelProperty(name = "field", value = "区间字段(用于查询指标越限列表)")
+    @ApiModelProperty("区间字段(用于查询指标越限列表)")
    private String field;

-    @ApiModelProperty(name = "time0", value = "区间1时间集合")
+    @ApiModelProperty("区间1时间集合")
    private List<String> time0;

-    @ApiModelProperty(name = "time1", value = "区间2时间集合")
+    @ApiModelProperty("区间2时间集合")
    private List<String> time1;

-    @ApiModelProperty(name = "time2", value = "区间3时间集合")
+    @ApiModelProperty("区间3时间集合")
    private List<String> time2;

-    @ApiModelProperty(name = "time3", value = "区间4时间集合")
+    @ApiModelProperty("区间4时间集合")
    private List<String> time3;

-    @ApiModelProperty(name = "time4", value = "区间5时间集合")
+    @ApiModelProperty("区间5时间集合")
    private List<String> time4;

-    @ApiModelProperty(name = "time5", value = "区间6时间集合")
+    @ApiModelProperty("区间6时间集合")
    private List<String> time5;

-    @ApiModelProperty(name = "time6", value = "区间7时间集合")
+    @ApiModelProperty("区间7时间集合")
    private List<String> time6;

-    @ApiModelProperty(name = "time7", value = "区间8时间集合")
+    @ApiModelProperty("区间8时间集合")
    private List<String> time7;

-    @ApiModelProperty(name = "time8", value = "区间9时间集合")
+    @ApiModelProperty("区间9时间集合")
    private List<String> time8;

-    @ApiModelProperty(name = "time9", value = "区间10时间集合")
+    @ApiModelProperty("区间10时间集合")
    private List<String> time9;

 }
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PowerStatisticsTargetVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PowerStatisticsTargetVO.java
@@ -3,6 +3,8 @@ package com.njcn.harmonic.pojo.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;

 /**
 * 有功功率趋势指标 实体类
@@ -17,27 +19,84 @@ public class PowerStatisticsTargetVO {
    private String time;

    @ApiModelProperty("电压偏差")
-    private Integer voltageOffset;
+    private Integer voltageOffset = 0;

-    @ApiModelProperty(value = "谐波电压")
-    private Integer vTimes;
+    @ApiModelProperty("谐波电压")
+    private Integer vTimes = 0;

-    @ApiModelProperty(value = "谐波电流")
-    private Integer iTimes;
+    @ApiModelProperty("谐波电流")
+    private Integer iTimes = 0;

    @ApiModelProperty("三相电压不平衡度")
-    private Integer ubalance;
+    private Integer ubalance = 0;

-    @ApiModelProperty(value="电压波动")
-    private Integer voltageFluctuation;
+    @ApiModelProperty("电压波动")
+    private Integer voltageFluctuation = 0;

    @ApiModelProperty("闪变")
-    private Integer flicker;
+    private Integer flicker = 0;

    @ApiModelProperty("间谐波电压含有率")
-    private Integer interHarmonic;
+    private Integer interHarmonic = 0;

    @ApiModelProperty("电流不平衡度")
-    private Integer sequenceCurrentUnbalance;
+    private Integer sequenceCurrentUnbalance = 0;
+
+    @ApiModelProperty("区间字段(标识是哪个区间:10%~20%、20%~30%....)用于后端辅助计算")
+    private String field;
+
+    @ApiModelProperty("电压偏差详情")
+    private List<ThdDataVO> voltageOffsetList = new ArrayList<>();
+
+    @ApiModelProperty("谐波电压详情")
+    private List<ThdDataVO> vTimesList = new ArrayList<>();
+
+    @ApiModelProperty("谐波电流详情")
+    private List<ThdDataVO> iTimestList = new ArrayList<>();
+
+    @ApiModelProperty("三相电压不平衡度详情")
+    private List<ThdDataVO> ubalanceList = new ArrayList<>();
+
+    @ApiModelProperty("电压波动")
+    private List<ThdDataVO> voltageFluctuationList = new ArrayList<>();
+
+    @ApiModelProperty("闪变详情")
+    private List<ThdDataVO> flickerList = new ArrayList<>();
+
+    @ApiModelProperty("间谐波电压含有率详情")
+    private List<ThdDataVO> interHarmonicList = new ArrayList<>();
+
+    @ApiModelProperty("电流不平衡度详情")
+    private List<ThdDataVO> sequenceCurrentUnbalanceList = new ArrayList<>();
+
+    @ApiModelProperty("越限相别(用于后端辅助计算)")
+    private String phasicType;
+
+    @ApiModelProperty("越限统计方式(用于后端辅助计算)")
+    private String valueType;;
+
+    @ApiModelProperty("电压偏差国标限制(用于后端辅助计算)")
+    private Float voltageOffsetLimit;
+
+    @ApiModelProperty("谐波电压国标限制(用于后端辅助计算)")
+    private Float vTimesLimit;
+
+    @ApiModelProperty("谐波电流国标限制(用于后端辅助计算)")
+    private Float iTimesLimit;
+
+    @ApiModelProperty("三相电压不平衡度国标限制(用于后端辅助计算)")
+    private Float ubalanceLimit;
+
+    @ApiModelProperty("电压波动国标限制(用于后端辅助计算)")
+    private Float voltageFluctuationLimit;
+
+    @ApiModelProperty("闪变国标限制(用于后端辅助计算)")
+    private Float flickerLimit;
+
+    @ApiModelProperty("间谐波电压含有率国标限制(用于后端辅助计算)")
+    private Float interHarmonicLimit;
+
+    @ApiModelProperty("电流不平衡度国标限制(用于后端辅助计算)")
+    private Float sequenceCurrentUnbalanceLimit;

 }
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ThdDataVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ThdDataVO.java
@@ -1,5 +1,6 @@
 package com.njcn.harmonic.pojo.vo;

+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 /**
@@ -10,22 +11,64 @@ import lombok.Data;
@Data
 public class ThdDataVO {

+    @ApiModelProperty("名称")
    private String anotherName;
+
+    @ApiModelProperty("单位")
    private String unit;
-    private Double AVGPhaseA;
-    private Double AVGPhaseB;
-    private Double AVGPhaseC;

-    private Double CP95PhaseA;
-    private Double CP95PhaseB;
-    private Double CP95PhaseC;
+    @ApiModelProperty("平均值A相")
+    private String AVGPhaseA;

-    private Double MINPhaseA;
-    private Double MINPhaseB;
-    private Double MINPhaseC;
+    @ApiModelProperty("平均值B相")
+    private String AVGPhaseB;

-    private Double MAXPhaseA;
-    private Double MAXPhaseB;
-    private Double MAXPhaseC;
+    @ApiModelProperty("平均值C相")
+    private String AVGPhaseC;
+
+    @ApiModelProperty("CP95A相")
+    private String CP95PhaseA;
+
+    @ApiModelProperty("CP95B相")
+    private String CP95PhaseB;
+
+    @ApiModelProperty("CP95C相")
+    private String CP95PhaseC;
+
+    @ApiModelProperty("最小值A相")
+    private String MINPhaseA;
+
+    @ApiModelProperty("最小值B相")
+    private String MINPhaseB;
+
+    @ApiModelProperty("最小值C相")
+    private String MINPhaseC;
+
+    @ApiModelProperty("最大值A相")
+    private String MAXPhaseA;
+
+    @ApiModelProperty("最大值B相")
+    private String MAXPhaseB;
+
+    @ApiModelProperty("最大值C相")
+    private String MAXPhaseC;
+
+    @ApiModelProperty("国标限值")
+    private Float limit;
+
+    public void init(){
+        this.AVGPhaseA = "0";
+        this.AVGPhaseB = "0";
+        this.AVGPhaseC = "0";
+        this.CP95PhaseA = "0";
+        this.CP95PhaseB = "0";
+        this.CP95PhaseC = "0";
+        this.MINPhaseA = "0";
+        this.MINPhaseB = "0";
+        this.MINPhaseC = "0";
+        this.MAXPhaseA = "0";
+        this.MAXPhaseB = "0";
+        this.MAXPhaseC = "0";
+    }

 }