From e5589d2671ecb4ad0a21fba18059c70469203672 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期六, 12 四月 2025 18:24:20 +0800
Subject: [PATCH] 累计值 动态长度

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/impl/InfluxDBServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/impl/InfluxDBServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/impl/InfluxDBServiceImpl.java
index 7dd2fc5..06ab102 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/impl/InfluxDBServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/impl/InfluxDBServiceImpl.java
@@ -50,15 +50,18 @@
 
     @Override
     public List<InfluxModelResultVO> queryModelResults(InfluxModelResultPOJO pojo, Date startTime, Date endTime) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.MILLISECOND, 0);
         String start = startTime.toInstant().toString();
 
         if (startTime.getTime() == endTime.getTime()) {
             // 如果相等,则engTime加1毫秒,否则influxdb报错(因为influxdb的range函数是左闭右开区间,所以将engTime加一毫秒,才可以查到startTime时间点的数据)
             endTime.setTime(endTime.getTime() + 1);
         }
-        String stop = endTime.toInstant().toString();
+
+        // 结束时间默认追加10s
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(endTime);
+        calendar.add(Calendar.MILLISECOND, 10 * 1000 + 1);
+        String stop = calendar.getTime().toInstant().toString();
 
         List<InfluxModelResultVO> dataList = new ArrayList<>();
         String measurement = MeasurementUtils.getMeasurement(pojo.getType());

--
Gitblit v1.9.3