iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java

@@ -96,10 +96,10 @@
                queryIndItemDTO.setEnd(columnItem.getEndTime());
                List<ApiIndItemValueDTO> indItemValueList = indItemApi.queryIndItemHistoryValue(queryIndItemDTO);
                if (!CollectionUtils.isEmpty(indItemValueList)) {
                    matrix = new double[entry.getDataLength()][0];
                    if (indItemValueList.size() > entry.getDataLength()) {
                        indItemValueList = indItemValueList.subList(0, entry.getDataLength());
                    }
                    matrix = new double[indItemValueList.size()][0];
//                    if (indItemValueList.size() > entry.getDataLength()) {
//                        indItemValueList = indItemValueList.subList(0, entry.getDataLength());
//                    }
                    for (int i = 0; i < indItemValueList.size(); i++) {
                        String stringValue = indItemValueList.get(i).getDataValue().toString();
                        double[] asciiArray = ASCIIUtil.stringToAsciiArray(stringValue);
@@ -198,9 +198,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)) {