From b4b4596887770a34f80c31ab849068893094dab5 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 24 二月 2025 10:47:08 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 c2bfd25..c7792e8 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
@@ -31,6 +31,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -88,6 +89,8 @@
             }
         }
 
+        int deviationIndex = 0;
+
         //对每个爪分别进行计算
         for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
             double[][] matrix = new double[0][0];
@@ -129,6 +132,13 @@
                     }
                 }
 
+                //找出对应的调整值
+                double[] deviationItem = null;
+                if (sampleInfo.getDeviation() != null && sampleInfo.getDeviation().length > 0) {
+                    deviationItem = sampleInfo.getDeviation()[deviationIndex];
+                }
+                deviationIndex ++;
+
                 //对每一项依次进行数据查询,然后将查询出的值赋给matrix对应的位置
                 for (int i = 0; i < entry.getColumnItemList().size(); i++) {
                     try {
@@ -153,8 +163,6 @@
                     }
                 }
             }
-
-
             SampleData sampleData = new SampleData();
             sampleData.setMatrix(matrix);
             sampleDataList.add(sampleData);

--
Gitblit v1.9.3