From 8688bfa3bba72f0e89520014a67454493b25e416 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 20 三月 2025 10:46:54 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 20 ++++++++++++--------
1 files changed, 12 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..75f2d1a 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,20 @@
*/
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());
+ break;
+ case PLAN:
+ 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() - 1, columnItem.getGranularity());
break;
case NORMALITEM:
case MERGEITEM:
- dateTime = calendar.getTime();
+ dateTime = calculateTime(originalTime, false, 1, columnItem.getGranularity());
break;
default:
break;
@@ -113,14 +113,18 @@
calendar.setTime(originalTime);
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
+ dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
+ break;
+ case PLAN:
+ dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
+ break;
case IND:
case IND_ASCII:
- case PLAN:
- dateTime = calendar.getTime();
+ dateTime = originalTime;
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