From 8ba6a45012aa4d5bdc5bd404e73d36ad9ec327ca Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 21 三月 2025 16:48:32 +0800
Subject: [PATCH] 如果模拟调整先查调整结果
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java | 14 ++++++++++++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/ColumnItem.java | 6 +++++-
2 files changed, 17 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 c306fc4..7723944 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
@@ -81,6 +81,15 @@
}
}
+ // 判断要调整的列
+ for (ColumnItemPort itemPort : sampleInfo.getColumnInfo()) {
+
+ for (ColumnItem columnItem : itemPort.getColumnItemList()) {
+
+ }
+ }
+
+
int portIdx = 1;
//对每个爪分别进行计算
for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
@@ -198,9 +207,10 @@
case MERGEITEM:
List<DataValueVO> predictValue = new ArrayList<>();
if (sampleInfo.getIsAdjust()) {
- // 模拟调整数据查询
+ // 如果模拟调整先查调整结果
predictValue = stAdjustResultService.getPredictValue(columnItem.getParamId(), sampleInfo.getPredictTime());
- } else {
+ }
+ if (CollectionUtils.isEmpty(predictValue)) {
predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
}
if (CollectionUtils.isEmpty(predictValue)) {
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/ColumnItem.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/ColumnItem.java
index c61beb3..866d989 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/ColumnItem.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/ColumnItem.java
@@ -5,7 +5,6 @@
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.sql.Timestamp;
import java.util.Date;
@Data
@@ -58,4 +57,9 @@
* 采样粒度
*/
public Integer granularity;
+
+ /**
+ * 是否模拟调整
+ */
+ private Boolean isAdjust = false;
}
--
Gitblit v1.9.3