diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatIntegrityDServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatIntegrityDServiceImpl.java index 43d18ec..4979bac 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatIntegrityDServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatIntegrityDServiceImpl.java @@ -23,6 +23,7 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; @@ -59,6 +60,10 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl csLinePOList = csLineFeignClient.getLinesByDevList(devIdList).getData(); csLinePOList.forEach(item->{ + //没有统计间隔就计算下一次监测点 + if (Objects.isNull(item.getLineInterval())) { + return; + } //应收数据 int dueCount = 1440 / item.getLineInterval(); Integer process = devMap.get(item.getDeviceId()).getProcess(); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatOnlineRateDServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatOnlineRateDServiceImpl.java index bba0b9c..4931976 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatOnlineRateDServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatOnlineRateDServiceImpl.java @@ -170,6 +170,8 @@ public class RStatOnlineRateDServiceImpl extends MppServiceImpl communicateDataOld = pqsCommunicateService.getRawDataEnd(lineParam);