pms代码合并

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/SubstationFeignClientFallbackFactory.java

@@ -5,7 +5,6 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pq.api.SubstationFeignClient;
 import com.njcn.device.pq.pojo.dto.SubstationDTO;
-import com.njcn.device.pq.pojo.po.Substation;
 import com.njcn.device.pq.utils.DeviceEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/DeviceResponseEnum.java

@@ -32,8 +32,8 @@ public enum DeviceResponseEnum {
 
     DEVICE_SAME_NAME("A0290","设备名称已存在"),
     DEVICE_REPETITION("A0291","设备名称重复"),
-    DEVICE_IP_REPETITION("A0292","设备IP重复"),
-    DEVICE_SAME_IP("A0293","当前设备ip已存在"),
+    DEVICE_IP_REPETITION("A0292","设备ip端口号重复"),
+    DEVICE_SAME_IP("A0293","当前设备ip端口号已存在"),
     DEVICE_EMPTY("A0294","设备为空"),
 
     NODE_SAME_NAME("A0259","前置机名称已存在"),

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DataFlicker.java

@@ -0,0 +1,32 @@
+package com.njcn.device.pq.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * data_flicker influxDB别名映射表
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/11/29 15:27
+ */
+@Data
+@Measurement(name = "data_flicker")
+public class DataFlicker {
+
+    @Column(name = "time")
+    private Instant time;
+
+    @Column(name = "line_id")
+    private String lineId;
+
+    @Column(name = "pst_count")
+    private Integer pstCount;
+
+    @Column(name = "plt_count")
+    private Integer pltCount;
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DataV.java

@@ -7,85 +7,66 @@ import org.influxdb.annotation.Measurement;
 import java.time.Instant;
 
 /**
- * Description:
- * 接口文档访问地址：http://serverIP:port/swagger-ui.html
- * Date: 2023/1/12  11:27【需求编号】
+ * data_v influxDB别名映射表
  *
- * @author clam
- * @version V1.0.0
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/27 15:27
  */
-
-@Measurement(
-        name = "data_v"
-)
 @Data
+@Measurement(name = "data_v")
 public class DataV {
-    @Column(
-            name = "time"
-    )
+
+    @Column(name = "time")
     private Instant time;
-    @Column(
-            name = "line_id"
-    )
+
+    @Column(name = "line_id")
     private String lineId;
-    @Column(
-            name = "freq_max"
-    )
+
+    @Column(name = "freq_max")
     private Double frepMAX;
-    @Column(
-            name = "freq_min"
-    )
+
+    @Column(name = "freq_min")
     private Double frepMIN;
-    @Column(
-            name = "rms_max"
-    )
+
+    @Column(name = "rms_max")
     private Double rmsMAX;
-    @Column(
-            name = "rms_min"
-    )
+
+    @Column(name = "rms_min")
     private Double rmsMIN;
-    @Column(
-            name = "rms_lvr_max"
-    )
+
+    @Column(name = "rms_lvr_max")
     private Double rmsLvrMAX;
-    @Column(
-            name = "rms_lvr_min"
-    )
+
+    @Column(name = "rms_lvr_min")
     private Double rmsLvrMIN;
-    @Column(
-            name = "v_thd_max"
-    )
+
+    @Column(name = "v_thd_max")
     private Double vThdMAX;
-    @Column(
-            name = "v_thd_min"
-    )
+
+    @Column(name = "v_thd_min")
     private Double vThdMIN;
-    @Column(
-            name = "v_unbalance_max"
-    )
+
+    @Column(name = "v_unbalance_max")
     private Double vUnbalanceMAX;
-    @Column(
-            name = "v_unbalance_min"
-    )
+
+    @Column(name = "v_unbalance_min")
     private Double vUnbalanceMIN;
-    @Column(
-            name = "freq_count"
-    )
+
+    @Column(name = "freq_count")
     private Integer freqCount;
-    @Column(
-            name = "rms_count"
-    )
+
+    @Column(name = "rms_count")
     private Integer rmsCount;
-    @Column(
-            name = "rms_lvr_count"
-    )
+
+    @Column(name = "rms_lvr_count")
     private Integer rmsLvrCount;
-    @Column(
-            name = "v_thd_count"
-    )
+
+    @Column(name = "v_thd_count")
     private Integer vThdCount;
-    @Column(
-            name = "v_unbalance_count"
-    )
+
+    @Column(name = "v_unbalance_count")
     private Integer vUnbalanceCount;
+
+
 }

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

@@ -1,6 +1,5 @@
 package com.njcn.device.pq.pojo.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,7 +8,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * Description:部门设备统计