处理依赖冲突问题

自定义报表问题处理

pqs-harmonic/harmonic-api/pom.xml

@@ -52,13 +52,6 @@
             <groupId>com.njcn</groupId>
             <artifactId>pqs-influx</artifactId>
             <version>0.0.1-SNAPSHOT</version>
-            <!--排除okhttp3的依赖-->
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
@@ -66,7 +59,6 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>com.github.jeffreyning</groupId>
             <artifactId>mybatisplus-plus</artifactId>

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

@@ -0,0 +1,110 @@
+package com.njcn.harmonic.pojo.po;
+
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.io.Serializable;
+import java.time.Instant;
+import java.time.LocalDateTime;
+
+@Data
+@Measurement(name = "pqs_comasses")
+public class PqsComasses implements Serializable {
+  @Column(name = "time")
+  private Instant timeid;
+
+  @Column(name = "line_id")
+  private String lineid;
+
+  @Column(name = "freq_dev1")
+  private Double freqDev1;
+
+  @Column(name = "freq_dev2")
+  private Double freqDev2;
+
+  @Column(name = "freq_dev3")
+  private Double freqDev3;
+
+  @Column(name = "freq_dev4")
+  private Double freqDev4;
+
+  @Column(name = "freq_dev5")
+  private Double freqDev5;
+
+  @Column(name = "vu_dev1")
+  private Double vuDev1;
+
+  @Column(name = "vu_dev2")
+  private Double vuDev2;
+
+  @Column(name = "vu_dev3")
+  private Double vuDev3;
+
+  @Column(name = "vu_dev4")
+  private Double vuDev4;
+
+  @Column(name = "vu_dev5")
+  private Double vuDev5;
+
+  @Column(name = "data_plt1")
+  private Double dataPlt1;
+  //电压闪变等级2
+  @Column(name = "data_plt2")
+  private Double dataPlt2;
+  //电压闪变等级3
+  @Column(name = "data_plt3")
+  private Double dataPlt3;
+  //电压闪变等级4
+  @Column(name = "data_plt4")
+  private Double dataPlt4;
+  //电压闪变等级5
+  @Column(name = "data_plt5")
+  private Double dataPlt5;
+
+  @Column(name = "v_unbalance1")
+  private Double vUnbalance1;
+
+  @Column(name = "v_unbalance2")
+  private Double vUnbalance2;
+
+  @Column(name = "v_unbalance3")
+  private Double vUnbalance3;
+
+  @Column(name = "v_unbalance4")
+  private Double vUnbalance4;
+
+  @Column(name = "v_unbalance5")
+  private Double vUnbalance5;
+
+  @Column(name = "v_thd1")
+  private Double vThd1;
+
+  @Column(name = "v_thd2")
+  private Double vThd2;
+
+  @Column(name = "v_thd3")
+  private Double vThd3;
+
+  @Column(name = "v_thd4")
+  private Double vThd4;
+
+  @Column(name = "v_thd5")
+  private Double vThd5;
+
+  @Column(name = "event1")
+  private Double event1;
+
+  @Column(name = "event2")
+  private Double event2;
+
+  @Column(name = "event3")
+  private Double event3;
+
+  @Column(name = "event4")
+  private Double event4;
+
+  @Column(name = "event5")
+  private Double event5;
+}