From 161669f992297c26e95934843277b3997471f42b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 十二月 2024 15:05:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java
index e3c6e3e..1aa3e26 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java
@@ -65,9 +65,9 @@
case MERGEITEM:
// 预测值
oneMin = PredGranularityEnum.MIN1.getCode() * 1000L;
- start = start - (start % oneMin) + oneMin;
- end = end - (end % oneMin) + oneMin;
- mins = ((end - start) / oneMin);
+ start = start - (start % oneMin);
+ end = end - (end % oneMin);
+ mins = ((end - start) / oneMin) + 1;
break;
case DATAPOINT:
// 测点值
--
Gitblit v1.9.3