From 15732a55b862cdc423475f4fb6b45fb8a7b55ed3 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期五, 29 十一月 2024 09:02:42 +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/SampleInfoConstructor.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 cd5f3f0..f59556b 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
@@ -85,7 +85,8 @@
}
dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue());
break;
- case PREDICTITEM:
+ case NORMALITEM:
+ case MERGEITEM:
dateTime = calendar.getTime();
break;
case IND:
@@ -120,7 +121,8 @@
}
dateTime = calendar.getTime();
break;
- case PREDICTITEM:
+ case NORMALITEM:
+ case MERGEITEM:
dateTime = calendar.getTime();
break;
case IND:
@@ -155,7 +157,10 @@
ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
granularity = DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue();
break;
- case PREDICTITEM:
+ case NORMALITEM:
+ granularity = mmPredictItemService.getItemByOutPutId(columnItem.getParamId()).getGranularity();
+ break;
+ case MERGEITEM:
granularity = mmPredictItemService.getItemById(columnItem.getParamId()).getGranularity();
break;
case IND:
--
Gitblit v1.9.3