From e03a3567aa5ae98cf3d17efcf8bae535d13d3860 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 02 四月 2025 20:15:27 +0800
Subject: [PATCH] POINT columnItem.getDataLength() - 1

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
index 430c810..6c60377 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
@@ -78,7 +78,8 @@
         Date dateTime = new Date();
         switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
             case DATAPOINT:
-                dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
+                dateTime = calculateTime(originalTime, true,
+                        columnItem.getDataLength() > 1 ? (columnItem.getDataLength() - 1) : columnItem.getDataLength(), columnItem.getGranularity());
                 break;
             case PLAN:
                 dateTime = originalTime;
@@ -111,7 +112,7 @@
         calendar.setTime(originalTime);
         switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
             case DATAPOINT:
-                dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
+                dateTime = calculateTime(originalTime, true, 0, columnItem.getGranularity());
                 break;
             case PLAN:
                 dateTime = calculateTime(originalTime, false, columnItem.getDataLength()-1, columnItem.getGranularity());

--
Gitblit v1.9.3