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); }