From 06dba45f26a514449412d88e41fe38c2556a5600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 13 Jan 2023 09:33:58 +0800 Subject: [PATCH] =?UTF-8?q?pms=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SubstationFeignClientFallbackFactory.java | 1 - .../device/pq/enums/DeviceResponseEnum.java | 4 +- .../njcn/device/pq/pojo/po/DataFlicker.java | 32 ++++++ .../com/njcn/device/pq/pojo/po/DataV.java | 101 +++++++----------- .../device/pq/pojo/vo/DeptDeviceDetailVO.java | 2 - 5 files changed, 75 insertions(+), 65 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DataFlicker.java diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/SubstationFeignClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/SubstationFeignClientFallbackFactory.java index d09fbea7f..832f5444d 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/SubstationFeignClientFallbackFactory.java +++ b/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; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/DeviceResponseEnum.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/DeviceResponseEnum.java index c4979f4ce..ff061b64b 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/DeviceResponseEnum.java +++ b/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","前置机名称已存在"), diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DataFlicker.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DataFlicker.java new file mode 100644 index 000000000..f130a4415 --- /dev/null +++ b/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; + +} diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DataV.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DataV.java index 9e4092b77..db8f65cff 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DataV.java +++ b/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; + + } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeptDeviceDetailVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeptDeviceDetailVO.java index 7b8745d36..e0e7acb60 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeptDeviceDetailVO.java +++ b/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:部门设备统计