From 280ca0c6a4a1e73ab4516d4850dedb5a43541594 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 20 一月 2025 15:25:31 +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 | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 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 ce370a3..48fa7e8 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
@@ -76,31 +76,21 @@
* @return
* @throws Exception
*/
- protected Date getStartTime(ColumnItem columnItem, Date originalTime, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
+ 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:
- ApiPointDTO dataPoint = pointMap.get(columnItem.getParamId());
- if (dataPoint == null) {
- return null;
- }
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue());
+ case PLAN:
+ dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
+ break;
+ case IND:
+ dateTime = calculateTime(originalTime, true, columnItem.getDataLength()-1, columnItem.getGranularity());
break;
case NORMALITEM:
case MERGEITEM:
dateTime = calendar.getTime();
- break;
- case IND:
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), 60);
- break;
- case PLAN:
- ApiPlanItemDTO apiPlanItemDTO = planMap.get(columnItem.getParamId());
- if (apiPlanItemDTO == null) {
- return null;
- }
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), TimeGranularitySecEnum.getEumByCode(apiPlanItemDTO.getTimeGranularity()).getValue());
break;
default:
break;
@@ -116,23 +106,19 @@
* @return
* @throws Exception
*/
- protected Date getEndTime(ColumnItem columnItem, Date originalTime,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
+ protected Date getEndTime(ColumnItem columnItem, Date originalTime) {
Date dateTime = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(originalTime);
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
+ case IND:
+ case PLAN:
dateTime = calendar.getTime();
break;
case NORMALITEM:
case MERGEITEM:
- dateTime = calculateTime(originalTime, false, columnItem.getDataLength(), 60);
- break;
- case IND:
- dateTime = calendar.getTime();
- break;
- case PLAN:
- dateTime = calendar.getTime();
+ dateTime = calculateTime(originalTime, false, columnItem.getDataLength(), columnItem.getGranularity());
break;
default:
break;
@@ -147,7 +133,7 @@
* @return
* @throws Exception
*/
- protected Integer getGranularity(ColumnItem columnItem,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
+ protected Integer getGranularity(ColumnItem columnItem,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap,Map<String, ApiIndItemDTO> indMap) {
// 默认60s
Integer granularity = 60;
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
@@ -160,7 +146,7 @@
granularity = mmPredictItemService.getItemByOutPutId(columnItem.getParamId()).getGranularity();
break;
case IND:
- ApiIndItemDTO indItemDTO = indItemApi.getInfoById(columnItem.getParamId());
+ ApiIndItemDTO indItemDTO = indMap.get(columnItem.getParamId());
granularity = TimeGranularitySecEnum.getEumByCode(indItemDTO.getTimeGranularity()).getValue();;
break;
case PLAN:
@@ -187,7 +173,7 @@
if (backward) {
timeLength = (-1) * dataLength;
} else {
- timeLength = dataLength - 1;
+ timeLength = dataLength;
}
Date desTime = originalTime;
Calendar calendar = Calendar.getInstance();
--
Gitblit v1.9.3