From 3d9106399d9a2b9c8ba7d2dea621f54fd71d2ca7 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 12 十一月 2024 10:56:23 +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/PredictSampleDataConstructor.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
index f6573a1..c9a6afa 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
@@ -90,7 +90,8 @@
}
//补全数据
ColumnItem columnItem = entry.getColumnItemList().get(i);
- dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.getEndTime(), columnItem.granularity);
+// dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.getEndTime(), columnItem.granularity);
+ dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.paramId,columnItem.getParamType());
/** 如果数据取不满，把缺失的数据点放在后面 */
if (dataEntityList != null && dataEntityList.size() != 0) {
@@ -122,12 +123,12 @@
String paramType = columnItem.getParamType();
switch (paramType) {
case "DATAPOINT":
- ApiPointDTO point = dataPointApi.getPointById(columnItem.getId());
+ ApiPointDTO point = dataPointApi.getInfoById(columnItem.getParamId());
ApiPointValueQueryDTO queryDto = new ApiPointValueQueryDTO();
queryDto.setPointNo(point.getPointNo());
queryDto.setStart(columnItem.getStartTime());
queryDto.setEnd(columnItem.getEndTime());
- List<ApiPointValueDTO> pointValueList = dataPointApi.getValue(queryDto);
+ List<ApiPointValueDTO> pointValueList = dataPointApi.queryPointHistoryValue(queryDto);
dataList = ConvertUtils.sourceToTarget(pointValueList, DataValueVO.class);
break;
case "PREDICTITEM":
--
Gitblit v1.9.3