diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
index e41f8601..9f3b1023 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -136,7 +137,7 @@ public class PdcDeviceDataService
                         """,
                         Tuple.class);
         nativeQuery.setParameter("startTime", request.getStartTime());
-        nativeQuery.setParameter("endTime", request.getEndTime());
+        nativeQuery.setParameter("endTime", request.getEndTime().isAfter(LocalDateTime.now())? LocalDateTime.now(): request.getEndTime());
         nativeQuery.setParameter("deviceGroup", request.getDeviceGroup());
 
         Duration duration = Duration.between(request.getStartTime(), request.getEndTime());
diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/dto/GetRealTImeReportRequest.java b/src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/dto/GetRealTImeReportRequest.java
index 18a6ff50..89ee7a56 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/dto/GetRealTImeReportRequest.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/dto/GetRealTImeReportRequest.java
@@ -12,5 +12,5 @@ public class GetRealTImeReportRequest {
 
     private LocalDateTime startTime;
 
-//    private LocalDateTime endTime;
+    private LocalDateTime endTime;
 }
diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/service/PdcDeviceRealTimeDataService.java b/src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/service/PdcDeviceRealTimeDataService.java
index c316f153..f10562eb 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/service/PdcDeviceRealTimeDataService.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/service/PdcDeviceRealTimeDataService.java
@@ -164,9 +164,13 @@ public class PdcDeviceRealTimeDataService
                 request.getStartTime() != null
                         ? request.getStartTime()
                         : LocalDateTime.now().toLocalDate().atStartOfDay());
+        LocalDateTime endTime = request.getEndTime() != null ? request.getEndTime() : LocalDateTime.now();
+        if (endTime.isAfter(LocalDateTime.now())){
+            endTime = LocalDateTime.now();
+        }
         nativeQuery.setParameter(
                 "endTime",
-                LocalDateTime.now().toLocalDate().atTime(23, 59, 59));
+                endTime);
 
         List list =
                 JpaUtils.convertTuplesToMap(