From 066dceaeafe41306175093c4aef0e27d040147ab Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 22 Aug 2025 12:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../csdevice/service/impl/RStatIntegrityDServiceImpl.java    | 5 +++++
 .../csdevice/service/impl/RStatOnlineRateDServiceImpl.java   | 2 ++
 2 files changed, 7 insertions(+)

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<RStatIntegrityDMa
                 //获取监测点信息
                 List<CsLinePO> 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<RStatOnlineRateD
                 long differ = DateUtil.between(date, newDate, DateUnit.MINUTE);
                 if (online.equals(type)) {
                     minute = InfluxDBPublicParam.DAY_MINUTE - (int) differ;
+                } else {
+                    minute = (int) differ;
                 }
             } else {
                 List<PqsCommunicateDto> communicateDataOld = pqsCommunicateService.getRawDataEnd(lineParam);