From 94b5b929916fc9b9671170265aa48e54f214a030 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 17 Jul 2025 10:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InfluxdbCsCommunicateServiceImpl.java        | 2 +-
 .../csdevice/service/impl/RStatOnlineRateDServiceImpl.java    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/InfluxdbCsCommunicateServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/InfluxdbCsCommunicateServiceImpl.java
index a9c1792..41cda98 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/InfluxdbCsCommunicateServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/InfluxdbCsCommunicateServiceImpl.java
@@ -95,7 +95,7 @@ public class InfluxdbCsCommunicateServiceImpl implements ICsCommunicateService {
                 .select(PqsCommunicate::getDevId)
                 .select(PqsCommunicate::getDescription)
                 .select(PqsCommunicate::getType)
-                .le(PqsCommunicate::getTime, lineParam.getEndTime())
+                .between(PqsCommunicate::getTime, lineParam.getStartTime(), lineParam.getEndTime())
                 .timeDesc()
                 .limit(1);
         List<PqsCommunicate> list = pqsCommunicateMapper.selectByQueryWrapper(influxQueryWrapper);
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..286f246 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
@@ -188,6 +188,10 @@ public class RStatOnlineRateDServiceImpl extends MppServiceImpl<RStatOnlineRateD
                     } catch (ParseException e) {
                         throw new RuntimeException(e);
                     }
+                } else {
+                        if (online.equals(communicateDataOld.get(0).getType())){
+                        minute = InfluxDBPublicParam.DAY_MINUTE;
+                    }
                 }
             }
         }