From b82ba2a29aa9ee181c707677157d8057fff68450 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 16 十二月 2024 13:50:33 +0800
Subject: [PATCH] 预测项数据图表查询bug，不能从缓存中查item，要最新的运行时间
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 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..54dea55 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
@@ -46,14 +46,14 @@
* @param predictTime
* @return
*/
- public SampleInfo prepareSampleInfo(String modelId, Date predictTime) {
+ protected SampleInfo prepareSampleInfo(String modelId, Date predictTime) {
SampleInfo sampleInfo = new SampleInfo();
//调用样本列数的方法
- sampleInfo.setSampleColumn(getSampleColumn(modelId));
+// sampleInfo.setSampleColumn(getSampleColumn(modelId));
//样本的列信息
sampleInfo.setColumnInfo(getColumnInfo(modelId, predictTime));
//样本的采样周期
- sampleInfo.setSampleCycle(getSampleCycle(modelId));
+// sampleInfo.setSampleCycle(getSampleCycle(modelId));
return sampleInfo;
}
@@ -64,6 +64,24 @@
* @return
*/
protected abstract Integer getSampleColumn(String modelId);
+
+
+ /**
+ * 样本的列信息
+ *
+ * @param modelId
+ * @param predictTime
+ * @return
+ */
+ protected abstract List<ColumnItemPort> getColumnInfo(String modelId, Date predictTime);
+
+ /**
+ * 样本的采样周期
+ *
+ * @param modelId
+ * @return
+ */
+ protected abstract Integer getSampleCycle(String modelId);
/**
* 获取开始时间
@@ -85,7 +103,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 +139,8 @@
}
dateTime = calendar.getTime();
break;
- case PREDICTITEM:
+ case NORMALITEM:
+ case MERGEITEM:
dateTime = calendar.getTime();
break;
case IND:
@@ -155,8 +175,11 @@
ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
granularity = DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue();
break;
- case PREDICTITEM:
- granularity = mmPredictItemService.getItemById(columnItem.getParamId()).getGranularity();
+ case NORMALITEM:
+ granularity = mmPredictItemService.getItemByOutPutId(columnItem.getParamId()).getGranularity();
+ break;
+ case MERGEITEM:
+ granularity = mmPredictItemService.getItemByIdFromCache(columnItem.getParamId()).getGranularity();
break;
case IND:
ApiIndItemDTO indItemDTO = indItemApi.getInfoById(columnItem.getParamId());
@@ -171,23 +194,6 @@
}
return granularity;
}
-
- /**
- * 样本的列信息
- *
- * @param modelId
- * @param predictTime
- * @return
- */
- protected abstract List<ColumnItemPort> getColumnInfo(String modelId, Date predictTime);
-
- /**
- * 样本的采样周期
- *
- * @param modelId
- * @return
- */
- protected abstract Integer getSampleCycle(String modelId);
/**
* 计算取值的时间
--
Gitblit v1.9.3