1.pms变电站背景谐波算法

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java

@@ -67,7 +67,7 @@ public class Monitor extends BaseEntity {
 
 
     /**
-     * 监测线路名称
+     * 监测母线名称
      */
     private String lineName;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java

@@ -1,8 +1,13 @@
 package com.njcn.device.pms.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -12,16 +17,19 @@ import java.util.Date;
  * @since 2022-11-03 14:16:47
  */
 @Data
+@TableName(value="r_stat_busbar_harmonic_y")
 public class RStatBusbarHarmonicYPO implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 母线ID
      */
+    @MppMultiId
     private String busbarId;
     /**
      * 生成数据的时间,每年统计一次
      */
-    private Date dataDate;
+    @MppMultiId
+    private LocalDate dataDate;
     /**
      * 电压有效值最大
      */
@@ -37,6 +45,7 @@ public class RStatBusbarHarmonicYPO implements Serializable {
     /**
      * 电压有效值95概率大值
      */
+    @TableField(value = "v_effective_95")
     private Double vEffective95;
     /**
      * 电压总谐波畸变率最大
@@ -53,6 +62,7 @@ public class RStatBusbarHarmonicYPO implements Serializable {
     /**
      * 电压总谐波畸变率95概率大值
      */
+    @TableField(value = "v_thd_95")
     private Double vThd95;
     /**
      * 三相电压不平衡最大
@@ -69,6 +79,7 @@ public class RStatBusbarHarmonicYPO implements Serializable {
     /**
      * 三相电压不平衡95概率大值
      */
+    @TableField(value = "unbalance_95")
     private Double unbalance95;
     /**
      * 闪变最大
@@ -85,6 +96,7 @@ public class RStatBusbarHarmonicYPO implements Serializable {
     /**
      * 闪变95概率大值
      */
+    @TableField(value = "flicker_95")
     private Double flicker95;
 
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -65,7 +66,7 @@ public class RStatBusbarHarmonicYVO implements Serializable {
      * 生成数据的时间,每年统计一次
      */
     @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
-    private Date dataDate;
+    private LocalDate dataDate;
 
     /**
      * 电压有效最大值