样本构建修改

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/impl/InfluxDBServiceImpl.java

@@ -50,8 +50,6 @@

    @Override
    public List<InfluxModelResultVO> queryModelResults(InfluxModelResultPOJO pojo, Date startTime, Date endTime) {
        Calendar calendar = Calendar.getInstance();
        calendar.set(Calendar.MILLISECOND, 0);
        String start = startTime.toInstant().toString();

        if (startTime.getTime() == endTime.getTime()) {

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

@@ -202,12 +202,7 @@
                break;
            case NORMALITEM:
            case MERGEITEM:
                List<DataValueVO> predictValue = new ArrayList<>();
                if (columnItem.getStartTime().getTime() == columnItem.getEndTime().getTime()) {
                    predictValue = mmItemResultService.getPredictValueLast(columnItem.getParamId(), columnItem.getStartTime(), 2);
                } else {
                    predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
                }
                List<DataValueVO> predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
                if (CollectionUtils.isEmpty(predictValue)) {
                    break;
                }

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

@@ -80,6 +80,8 @@
        Date dateTime = new Date();
        switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
            case DATAPOINT:
                dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
                break;
            case PLAN:
                dateTime = calculateTime(originalTime, true, columnItem.getDataLength() + 1, columnItem.getGranularity());
                break;
@@ -111,6 +113,8 @@
        calendar.setTime(originalTime);
        switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
            case DATAPOINT:
                dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
                break;
            case PLAN:
                dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
                break;
@@ -120,7 +124,7 @@
                break;
            case NORMALITEM:
            case MERGEITEM:
                dateTime = calculateTime(originalTime, false, columnItem.getDataLength() + 1, columnItem.getGranularity());
                dateTime = calculateTime(originalTime, false, columnItem.getDataLength(), columnItem.getGranularity());
                break;
            default:
                break;