Merge remote-tracking branch 'origin/master'

pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/wave/WaveDataDTO.java

@@ -28,4 +28,10 @@ public class WaveDataDTO implements Serializable {
     private List<List<Float>> listRmsData;
     //波形对应的相别数量
     private Integer iPhasic;
+    //接线方式(0.星型接法;1.三角型接法;2.开口三角型接法)
+    private Integer ptType;
+    //PT变比
+    private Double pt;
+    //CT变比"
+    private Double ct;
 }

pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java

@@ -79,6 +79,8 @@ public enum CommonResponseEnum {
     DELETE_PID_EXIST("A0094", "存在子节点"),
 
     DELETE_PID_UNEXIST("A0095", "不存在子节点"),
+
+    FILE_EXIST("A0096", "文件已存在"),
     ;
 
     private final String code;

pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java

@@ -209,6 +209,16 @@ public interface InfluxDBPublicParam {
      */
     String LIMIT_TARGET = "limit_target";
 
+    /**
+     * pqs_comasses
+     */
+    String PQS_COMASSES = "pqs_comasses";
+
+    /**
+     * 终端运维日志表
+     */
+    String PQS_TERMINAL_LOGS = "pqs_terminal_logs";
+
     /**
      * 监测点状态信息表
      */
@@ -246,5 +256,9 @@ public interface InfluxDBPublicParam {
 
     String DEV_INDEX = "dev_id";
 
+    /**
+     * 稳态数据分析字段
+     */
+    String PHASIC_TYPET = "T";
 
 }