Merge remote-tracking branch 'origin/master'

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

@@ -141,8 +141,8 @@
                break;
            case NORMALITEM:
            case MERGEITEM:
                MmItemOutputEntity outPut = mmItemOutputService.getOutPutById(columnItem.getParamId());
                List<DataValueVO> predictValue = mmItemResultService.getPredictValue(outPut.getId(), columnItem.getStartTime(), columnItem.getEndTime());
//                MmItemOutputEntity outPut = mmItemOutputService.getOutPutById(columnItem.getParamId());
                List<DataValueVO> predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
                if (CollectionUtils.isEmpty(predictValue)) {
                    break;
                }
@@ -167,8 +167,8 @@
                break;
        }
        // 避免生产环境日志过多，分级打印
        log.debug("数据获取,columnItem:" + columnItem + ",dataList" + dataList);
        log.info("数据获取,columnItem:" + columnItem + ",dataListLength" + dataList.size());
        log.debug("数据获取,columnItem:" + columnItem + ",dataList：" + dataList);
        log.info("数据获取,columnItem:" + columnItem + ",dataListLength：" + dataList.size());
        return dataList;
    }
}

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

@@ -65,9 +65,9 @@
            case MERGEITEM:
                // 预测值
                oneMin = PredGranularityEnum.MIN1.getCode() * 1000L;
                start = start - (start % oneMin) + oneMin;
                end = end - (end % oneMin) + oneMin;
                mins = ((end - start) / oneMin);
                start = start - (start % oneMin);
                end = end - (end % oneMin);
                mins = ((end - start) / oneMin) + 1;
                break;
            case DATAPOINT:
                // 测点值