From ee72d431d2d7294f83008f2c8d2d4353f8de6df4 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 06 三月 2025 14:31:10 +0800
Subject: [PATCH] 模型参数 point取值区间后移
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 ce08ee6..ba11c8b 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,20 +78,18 @@
*/
protected Date getStartTime(ColumnItem columnItem, Date originalTime) {
Date dateTime = new Date();
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(originalTime);
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
case PLAN:
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
+ dateTime = calculateTime(originalTime, true, columnItem.getDataLength() + 1, columnItem.getGranularity());
break;
case IND:
case IND_ASCII:
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength()-1, columnItem.getGranularity());
+ dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
break;
case NORMALITEM:
case MERGEITEM:
- dateTime = calendar.getTime();
+ dateTime = calculateTime(originalTime, false, 1, columnItem.getGranularity());
break;
default:
break;
@@ -113,14 +111,14 @@
calendar.setTime(originalTime);
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
+ case PLAN:
case IND:
case IND_ASCII:
- case PLAN:
- dateTime = calendar.getTime();
+ dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
break;
case NORMALITEM:
case MERGEITEM:
- dateTime = calculateTime(originalTime, false, columnItem.getDataLength(), columnItem.getGranularity());
+ dateTime = calculateTime(originalTime, false, columnItem.getDataLength() + 1, columnItem.getGranularity());
break;
default:
break;
--
Gitblit v1.9.3