From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 27 二月 2025 16:00:28 +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/dto/SampleInfo.java | 16 +++++++++++++++-
1 files changed, 15 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 fe54b94..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
@@ -3,10 +3,12 @@
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;
@@ -34,11 +36,23 @@
private Integer sampleCycle;
// 调整值
- private double[][] 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