From 1e5dbbba19b49d1b9ac5b74fa952f2d98d2eb139 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Sat, 12 Oct 2024 15:43:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=AE=97=E6=B3=95=E6=8A=A5=E9=94=99=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java | 7 +++++-- .../pms/service/majornetwork/impl/MonitorServiceImpl.java | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java index 06e5193fe..d90194191 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; /** * pqs @@ -109,7 +110,9 @@ public class LineDevGetDTO { public void setTimeInterval(Integer timeInterval) { - this.interval = timeInterval; - this.timeInterval = timeInterval; + if(Objects.nonNull(timeInterval)) { + this.interval = timeInterval; + this.timeInterval = timeInterval; + } } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 48055a0f3..6b84ab32c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -314,7 +314,9 @@ public class MonitorServiceImpl extends ServiceImpl impl LineDevGetDTO lineDevGetDTO = new LineDevGetDTO(); lineDevGetDTO.setDevId(monitor.getTerminalId()); lineDevGetDTO.setPointId(monitor.getId()); + lineDevGetDTO.setInterval(monitor.getStatisticalInterval()); + System.out.println("获取主网测点统计间隔"+lineDevGetDTO.getInterval()); monitorList.add(lineDevGetDTO); }