异常数据清洗

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/dataClean/MonitorBaseParam.java

@@ -6,6 +6,8 @@ import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * @Author: cdf
  * @CreateTime: 2025-03-26
@@ -27,6 +29,10 @@ public class MonitorBaseParam extends BaseParam {
     @ApiModelProperty(value = "预警天数阈值")
     private Integer warnDayLimit;
 
+    private List<String> monitorIds;
+
+    private String monitorId;
+
 
 
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java

@@ -74,6 +74,9 @@ public class AreaLineInfoVO implements Serializable {
     @ApiModelProperty(name = "ip",value = "装置ip")
     private String ip;
 
+    @ApiModelProperty(name = "deviceName",value = "装置名称")
+    private String deviceName;
+
     @ApiModelProperty(name = "lat",value = "维度")
     private BigDecimal lat;
 
@@ -116,6 +119,16 @@ public class AreaLineInfoVO implements Serializable {
     @ApiModelProperty(name = "type",value = "冀北电网一张图类型信息")
     private Integer type;
 
-    @ApiModelProperty(name = "新能源场站信息ID")
+    @ApiModelProperty(name = "newStationId",value = "新能源场站信息ID")
+    @Deprecated
     private String newStationId;
+
+    @ApiModelProperty(name = "bigObjType",value = "检测对象大类")
+    private String bigObjType;
+
+    @ApiModelProperty(name = "smallObjType",value = "检测对象小类")
+    private String smallObjType;
+
+    @ApiModelProperty(name = "objId",value = "对象id")
+    private String objId;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/DetailAbnormalVO.java

@@ -0,0 +1,48 @@
+package com.njcn.device.pq.pojo.vo.dataClean;
+
+import lombok.Data;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2025-03-31
+ * @Description:
+ */
+@Data
+public class DetailAbnormalVO {
+
+    private String monitorId;
+
+    private String date;
+
+    private String monitorName;
+
+    private Long timeSum;
+
+
+
+
+    @Data
+    public static class DetailAbnormalInnerVO{
+
+        //时间
+        private String time;
+
+        private String targetKey;
+
+        //指标类型
+        private String targetName;
+        //相别
+        private String phaseType;
+        //合理范围
+        private String rangeDesc;
+        //最大
+        private String max;
+        //最小
+        private String min;
+        //平均
+        private String avg;
+        //CP95
+        private String cp95;
+
+    }
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/PowerQualityIndicatorsVO.java

@@ -10,6 +10,7 @@ import lombok.Data;
 @Data
 public class PowerQualityIndicatorsVO {
 
+    private String monitorId;
     //监测点名称
     private String monitorName;
     //所属终端名称
@@ -23,8 +24,8 @@ public class PowerQualityIndicatorsVO {
     //电压等级
     private String voltageLevel;
     //异常天数
-    private String abnormalDay;
+    private Integer abnormalDay;
     //严重度
-    private Double severity;
+    private Integer severity;
 
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/VerifyMonitorVO.java

@@ -22,56 +22,11 @@ public class VerifyMonitorVO {
 
 
 
-
-
-    // 频率，范围 42.5~57.5
-    private double frequency;
-    // 频率偏差，范围 -7.5~7.5
-    private double frequencyDeviation;
-    // 相（线）电压有效值，范围 0~150%U
-    private double phaseOrLineVoltageRms;
-    // 电压偏差，范围 -20%~20%
-    private double voltageDeviation;
-    // 电流有效值，大于 CT 一次变比
-    private double currentRms;
-    // 单相功率因数，范围 -1~1
-    private double singlePhasePowerFactor;
-    // 单相基波功率因数，范围 -1~1
-    private double singlePhaseFundamentalPowerFactor;
-    // 三相功率因数，范围 -1~1
-    private double threePhasePowerFactor;
-    // 基波功率因数，范围 -1~1
-    private double fundamentalPowerFactor;
-    // 电压总谐波畸变率，范围 0~30%
-    private double voltageTotalHarmonicDistortion;
-    // 相（线）电压基波有效值，范围 0~150%U
-    private double phaseOrLineVoltageFundamentalRms;
-    // 相（线）电压基波相角，范围 -180~180
-    private double phaseOrLineVoltageFundamentalPhaseAngle;
-    // 谐波电压含有率，范围 0~30%
-    private double harmonicVoltageContentRate;
-    // 谐波电压相角，范围 -180~180
-    private double harmonicVoltagePhaseAngle;
-    // 间谐波电压含有率，范围 0~30%
-    private double interHarmonicVoltageContentRate;
-    // 正序、负序和零序电压，范围 0~150%U
-    private double positiveNegativeZeroSequenceVoltage;
-    // 负序电压不平衡度，范围 0~40%
-    private double BalanceV;
-    // 零序电压不平衡度，范围 0~40%
-    private double zeroSequenceVoltageUnbalanceDegree;
-    // 电压波动，范围 0~40%
-    private double voltageFluctuation;
-    // 短时间闪变值，范围 0~20
-    private double shortTermFlickerValue;
-    // 长时间闪变值，范围 0~20
-    private double longTermFlickerValue;
-    // 电压暂降特征幅值，范围 0~90%
-    private double voltageSagCharacteristicAmplitude;
-    // 电压暂升特征幅值
-    private double voltageSwellCharacteristicAmplitude;
-
+    private List<VerifyTargetVO> targetList;
 
     private List<Map<String,Object>> mapList;
 
+    private List<PowerQualityIndicatorsVO> monitorAlarmInfo;
+
+
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/VerifyTargetVO.java

@@ -0,0 +1,25 @@
+package com.njcn.device.pq.pojo.vo.dataClean;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2025-03-31
+ * @Description: 指标异常详情
+ */
+@Data
+public class VerifyTargetVO {
+
+    private String key;
+
+    private String targetName;
+
+    private String rangeDesc;
+
+    private Set<String> ids;
+
+    private Integer sort;
+}