From 536b8e85745a42806214ee708297642f493d3cd8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 30 九月 2024 17:41:17 +0800
Subject: [PATCH] data 接口更新
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java | 4 ++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 8 +++-----
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java | 2 +-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemMergeHandlerImpl.java | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java
index 1b95499..b0ab71d 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java
@@ -40,7 +40,7 @@
resultMap.put(itemOutPutList.get(0).getId(), predictResult.getPredictList());
return resultMap;
}
- ApiPointDTO point = dataPointApi.getPointById(itemOutPutList.get(0).getPointId());
+ ApiPointDTO point = dataPointApi.getInfoById(itemOutPutList.get(0).getPointId());
List<Date> dateTimeList = new ArrayList<>();
Integer rows = predictResult.getPredictMatrix().length;
Integer columns = predictResult.getPredictMatrix()[0].length;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemMergeHandlerImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemMergeHandlerImpl.java
index b00251d..d996277 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemMergeHandlerImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemMergeHandlerImpl.java
@@ -67,7 +67,7 @@
Date endTime = predictTime;
ItemVO itemEntity = itemEntityFactory.getItemByItemNo(itemNo);
List<MmItemOutputVO> outPutList = itemEntityFactory.getOutPutByItemId(itemEntity.getId());
- ApiPointDTO pointEntity = dataPointApi.getPointById(outPutList.get(0).getPointId());
+ ApiPointDTO pointEntity = dataPointApi.getInfoById(outPutList.get(0).getPointId());
Calendar calendar = Calendar.getInstance();
calendar.setTime(endTime);
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..0828ae3 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
@@ -122,12 +122,12 @@
String paramType = columnItem.getParamType();
switch (paramType) {
case "DATAPOINT":
- ApiPointDTO point = dataPointApi.getPointById(columnItem.getId());
+ ApiPointDTO point = dataPointApi.getInfoById(columnItem.getId());
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":
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 c86dc27..a67ac2d 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
@@ -8,9 +8,7 @@
import com.iailab.module.model.mdk.sample.dto.ColumnItemPort;
import com.iailab.module.model.mdk.sample.dto.SampleInfo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -68,7 +66,7 @@
calendar.setTime(originalTime);
switch (columnItem.getParamType()) {
case "DATAPOINT":
- ApiPointDTO dataPoint = dataPointApi.getPointById(columnItem.getParamId());
+ ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
if (dataPoint == null) {
return null;
}
@@ -103,7 +101,7 @@
calendar.setTime(originalTime);
switch (columnItem.getParamType()) {
case "DATAPOINT":
- ApiPointDTO dataPoint = dataPointApi.getPointById(columnItem.getParamId());
+ ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
if (dataPoint == null) {
return null;
}
@@ -135,7 +133,7 @@
Integer granularity = 60;
switch (columnItem.getParamType()) {
case "DATAPOINT":
- ApiPointDTO dataPoint = dataPointApi.getPointById(columnItem.getParamId());
+ ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
granularity = DataPointFreq.getEumByCode(dataPoint.getMinfreqid()).getValue();
break;
case "PREDICTITEM":
--
Gitblit v1.9.3