From ba47b7b8e1080d460c89d34a5d693274880974f0 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 07 三月 2025 10:27:44 +0800
Subject: [PATCH] 预测结果 从下个时间粒度开始
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java
index 14fab98..7d4b804 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java
@@ -1,13 +1,19 @@
package com.iailab.module.model.mdk.sample.dto;
+import com.iailab.module.data.api.ind.dto.ApiIndItemDTO;
+import com.iailab.module.data.api.plan.dto.ApiPlanItemDTO;
+import com.iailab.module.data.api.point.dto.ApiPointDTO;
+import com.iailab.module.model.mdk.vo.StAdjustDeviationDTO;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.List;
+import java.util.Map;
@Data
@AllArgsConstructor
@@ -29,5 +35,24 @@
private Integer sampleCycle;
- private BigDecimal[][] deviation;
+ // 调整值
+ private List<StAdjustDeviationDTO> deviation;
+ // 所有测点信息，避免重复查询
+ private Map<String, ApiPointDTO> pointMap;
+ // 所有计划数据信息，避免重复查询
+ private Map<String, ApiPlanItemDTO> planMap;
+ // 所有计划数据信息，避免重复查询
+ private Map<String, ApiIndItemDTO> indMap;
+
+ public static double getAdjustValueFromDeviation(int portIdx, int paramIdx, List<StAdjustDeviationDTO> deviation) {
+ if (CollectionUtils.isEmpty(deviation)) {
+ return 0;
+ }
+ for (StAdjustDeviationDTO deviationItem : deviation) {
+ if (deviationItem.getPortIdx() == portIdx && deviationItem.getParamIdx() == paramIdx) {
+ return deviationItem.getValue();
+ }
+ }
+ return 0;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3