Merge remote-tracking branch 'origin/master'

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java

@@ -50,5 +50,10 @@ public class PollutionDTO {
      */
     private Double vInharm = 0.0;
 
+    /**
+     * 谐波电压含有率污染值
+     */
+    private Double vHarmonic = 0.0;
+
 
 }

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/influxdb/po/Communicate.java

@@ -0,0 +1,49 @@
+package com.njcn.prepare.harmonic.pojo.influxdb.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-01-07
+ */
+@Data
+@Measurement(name = "pqs_communicate")
+public class Communicate {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 终端Id
+     */
+    /**
+     * 更新时间
+     */
+    @Column(name = "time")
+    private Instant updateTime;
+
+    @Column(name = "dev_id")
+    private String devId;
+
+
+    /**
+     * 事件类型(0：中断；1：正常；2：退出)
+     */
+    @Column(name = "type")
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    @Column(name = "description")
+    private String remark;
+
+
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/AlarmPO.java

@@ -22,6 +22,7 @@ public class AlarmPO extends BaseEntity {
 
     private String deviceId;
 
+    private LocalDateTime updateTime;
 
     /**
      * 告警描述
@@ -69,9 +70,9 @@ public class AlarmPO extends BaseEntity {
     private Float flowProportion;
 
     /**
-     * 通讯终端次数
+     * 通讯中断次数
      */
-    private Integer comOutNum = 0;
+    private Integer comOutNum;
 
     /**
      * 中断时间段描述

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/TopMsgPO.java

@@ -4,6 +4,8 @@ import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class TopMsgPO extends BaseEntity {
@@ -26,7 +28,7 @@ public class TopMsgPO extends BaseEntity {
     /**
      * 通信中断时间段描述
      */
-    private String comOutDesc;
+    private List<String> comOutDesc;
 
     /**
      * 数据完整性标识 0.不达标 1.达标

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java

@@ -57,19 +57,19 @@ public class RStatComassesDPO implements Serializable {
     @TableField(value = "vu_dev5")
     private Double vuDev5;
 
-    @TableField(value = "data_pst1")
+    @TableField(value = "data_plt1")
     private Double dataPst1;
 
-    @TableField(value = "data_pst2")
+    @TableField(value = "data_plt2")
     private Double dataPst2;
 
-    @TableField(value = "data_pst3")
+    @TableField(value = "data_plt3")
     private Double dataPst3;
 
-    @TableField(value = "data_pst4")
+    @TableField(value = "data_plt4")
     private Double dataPst4;
 
-    @TableField(value = "data_pst5")
+    @TableField(value = "data_plt5")
     private Double dataPst5;
 
     @TableField(value = "v_unbalance1")