| | |
| | | List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap); |
| | | //补全数据 |
| | | ColumnItem columnItem = entry.getColumnItemList().get(i); |
| | | dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, |
| | | columnItem.paramId, columnItem.getParamType(), pointMap, planMap); |
| | | dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(),columnItem.getGranularity()); |
| | | |
| | | /** 如果数据取不满,把缺失的数据点放在后面 */ |
| | | if (dataEntityList != null && dataEntityList.size() != 0) { |
| | | logger.info("设置matrix, i = " + i + ", size = " + dataEntityList.size()); |
| | | for (int k = 0; k < dataEntityList.size(); k++) { |
| | | matrix[k][i] = dataEntityList.get(k).getDataValue(); |
| | | Double dataValue = dataEntityList.get(k).getDataValue(); |
| | | if (null != dataValue) { |
| | | matrix[k][i] = dataValue; |
| | | } |
| | | } |
| | | } |
| | | } catch (Exception e) { |