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

@@ -13,6 +13,7 @@
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.data.common.ApiDataQueryDTO;
import com.iailab.module.data.common.ApiDataValueDTO;
import com.iailab.module.model.common.utils.ASCIIUtil;
import com.iailab.module.model.mcs.pre.service.MmItemOutputService;
import com.iailab.module.model.mcs.pre.service.MmItemResultJsonService;
import com.iailab.module.model.mcs.pre.service.MmItemResultService;
@@ -77,10 +78,44 @@
        Map<String, ApiPointDTO> pointMap = sampleInfo.getPointMap();
        Map<String, ApiPlanItemDTO> planMap = sampleInfo.getPlanMap();
        Map<String, ApiIndItemDTO> indMap = sampleInfo.getIndMap();
        // 校验数据
        for (ColumnItemPort itemPort : sampleInfo.getColumnInfo()) {
            for (ColumnItem columnItem : itemPort.getColumnItemList()) {
                if (columnItem.getParamType().equals(ModelParamType.IND_ASCII.getCode())) {
                    if (columnItem.getModelParamOrder() != 1 || itemPort.getColumnItemList().size() != 1) {
                        throw new RuntimeException("模型输入数据异常：IND_ASCII类型输入独占一个端口；ParamPortOrder:" + columnItem.getModelParamPortOrder() + ",ParamOrder:" + columnItem.getModelParamOrder());
                    }
                }
            }
        }

        int deviationIndex = 0;

        //对每个爪分别进行计算
        for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
            double[][] matrix = new double[0][0];
            // 特殊处理IND_ASCII类型
            if (entry.getColumnItemList().get(0).getParamType().equals(ModelParamType.IND_ASCII.getCode())) {
                // 获取指标数据
                ColumnItem columnItem = entry.getColumnItemList().get(0);
                ApiIndItemQueryDTO queryIndItemDTO = new ApiIndItemQueryDTO();
                ApiIndItemDTO intItem = indMap.get(columnItem.getParamId());
                queryIndItemDTO.setItemNo(intItem.getItemNo());
                queryIndItemDTO.setStart(columnItem.getStartTime());
                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());
                    }
                    for (int i = 0; i < indItemValueList.size(); i++) {
                        String stringValue = indItemValueList.get(i).getDataValue().toString();
                        double[] asciiArray = ASCIIUtil.stringToAsciiArray(stringValue);
                        matrix[i] = asciiArray;
                    }
                }
            }else {
            //先依据爪内数据项的modelParamOrder进行排序——重写comparator匿名函数
            Collections.sort(entry.getColumnItemList(), new Comparator<ColumnItem>() {
                @Override
@@ -90,7 +125,7 @@
            });

            //默认都是double类型的数据,且按列向量进行拼接,默认初始值为0.0
            double[][] matrix = new double[entry.getDataLength()][entry.getColumnItemList().size()];
                matrix = new double[entry.getDataLength()][entry.getColumnItemList().size()];
            for (int i = 0; i < entry.getColumnItemList().size(); i++) {
                for (int j = 0; j < entry.getDataLength(); j++) {
                    matrix[j][i] = -2.0;
@@ -108,19 +143,6 @@
            for (int i = 0; i < entry.getColumnItemList().size(); i++) {
                try {
                    List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap,indMap);

                    //设置调整值
                    if (deviationItem != null && deviationItem.length > 0) {
                        logger.info("设置调整值, i = " + i);
                        if (deviationItem[i] <= 0) {
                            continue;
                        }
                        for(int dataKey = 1; dataKey < dataEntityList.size(); dataKey ++) {
                            DataValueVO item = dataEntityList.get(dataKey);
                            item.setDataValue(item.getDataValue() + deviationItem[i]);
                        }
                    }

                    // 补全数据
                    ColumnItem columnItem = entry.getColumnItemList().get(i);
                    dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(),columnItem.getGranularity());
@@ -138,6 +160,7 @@
                } catch (Exception e) {
                    e.printStackTrace();
                    throw e;
                    }
                }
            }
            SampleData sampleData = new SampleData();
@@ -216,9 +239,10 @@
                dataList = indItemValueList.stream().map(t -> {
                    DataValueVO vo = new DataValueVO();
                    vo.setDataTime(DateUtil.parse(t.getDataTime()));
                    vo.setDataValue(t.getDataValue());
                    vo.setDataValue(Double.valueOf(t.getDataValue().toString()));
                    return vo;
                }).collect(Collectors.toList());
                break;
            default:
                break;
        }