From 79914dabac38d83676ea16ff65da8d941a099285 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 08 十月 2024 10:38:01 +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 | 8 +++-----
1 files changed, 3 insertions(+), 5 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 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