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,7 @@
            }
        }

        int portIdx = 0;
        //对每个爪分别进行计算
        for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
            double[][] matrix = new double[0][0];
@@ -104,7 +106,7 @@
                if (!CollectionUtils.isEmpty(indItemValueList)) {
                    matrix = new double[entry.getDataLength()][0];
                    if (indItemValueList.size() > entry.getDataLength()) {
                        indItemValueList = indItemValueList.subList(0,entry.getDataLength());
                        indItemValueList = indItemValueList.subList(0, entry.getDataLength());
                    }
                    for (int i = 0; i < indItemValueList.size(); i++) {
                        String stringValue = indItemValueList.get(i).getDataValue().toString();
@@ -112,7 +114,7 @@
                        matrix[i] = asciiArray;
                    }
                }
            }else {
            } else {
                //先依据爪内数据项的modelParamOrder进行排序——重写comparator匿名函数
                Collections.sort(entry.getColumnItemList(), new Comparator<ColumnItem>() {
                    @Override
@@ -132,10 +134,20 @@
                //对每一项依次进行数据查询,然后将查询出的值赋给matrix对应的位置
                for (int i = 0; i < entry.getColumnItemList().size(); i++) {
                    try {
                        List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap,indMap);
                        List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap, indMap);

                        double adjustVal = SampleInfo.getAdjustValueFromDeviation(portIdx, i, sampleInfo.getDeviation());
                        if (adjustVal != 0) {
                            logger.info("设置调整值adjustVal:" + adjustVal);
                            for (int dataKey = 1; dataKey < dataEntityList.size(); dataKey++) {
                                DataValueVO item = dataEntityList.get(dataKey);
                                item.setDataValue(item.getDataValue() + adjustVal);
                            }
                        }

                        //补全数据
                        ColumnItem columnItem = entry.getColumnItemList().get(i);
                        dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(),columnItem.getGranularity());
                        dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(), columnItem.getGranularity());

                        /** 如果数据取不满，把缺失的数据点放在后面 */
                        if (dataEntityList != null && dataEntityList.size() != 0) {
@@ -152,9 +164,9 @@
                        throw e;
                    }
                }

                portIdx++;
            }


            SampleData sampleData = new SampleData();
            sampleData.setMatrix(matrix);
            sampleDataList.add(sampleData);