iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java
@@ -40,7 +40,7 @@ resultMap.put(itemOutPutList.get(0).getId(), predictResult.getPredictList()); return resultMap; } ApiPointDTO point = dataPointApi.getPointById(itemOutPutList.get(0).getPointId()); ApiPointDTO point = dataPointApi.getInfoById(itemOutPutList.get(0).getPointId()); List<Date> dateTimeList = new ArrayList<>(); Integer rows = predictResult.getPredictMatrix().length; Integer columns = predictResult.getPredictMatrix()[0].length; iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemMergeHandlerImpl.java
@@ -67,7 +67,7 @@ Date endTime = predictTime; ItemVO itemEntity = itemEntityFactory.getItemByItemNo(itemNo); List<MmItemOutputVO> outPutList = itemEntityFactory.getOutPutByItemId(itemEntity.getId()); ApiPointDTO pointEntity = dataPointApi.getPointById(outPutList.get(0).getPointId()); ApiPointDTO pointEntity = dataPointApi.getInfoById(outPutList.get(0).getPointId()); Calendar calendar = Calendar.getInstance(); calendar.setTime(endTime); iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
@@ -122,12 +122,12 @@ String paramType = columnItem.getParamType(); switch (paramType) { case "DATAPOINT": ApiPointDTO point = dataPointApi.getPointById(columnItem.getId()); ApiPointDTO point = dataPointApi.getInfoById(columnItem.getId()); ApiPointValueQueryDTO queryDto = new ApiPointValueQueryDTO(); queryDto.setPointNo(point.getPointNo()); queryDto.setStart(columnItem.getStartTime()); queryDto.setEnd(columnItem.getEndTime()); List<ApiPointValueDTO> pointValueList = dataPointApi.getValue(queryDto); List<ApiPointValueDTO> pointValueList = dataPointApi.queryPointHistoryValue(queryDto); dataList = ConvertUtils.sourceToTarget(pointValueList, DataValueVO.class); break; case "PREDICTITEM": iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
@@ -8,9 +8,7 @@ import com.iailab.module.model.mdk.sample.dto.ColumnItemPort; import com.iailab.module.model.mdk.sample.dto.SampleInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -68,7 +66,7 @@ calendar.setTime(originalTime); switch (columnItem.getParamType()) { case "DATAPOINT": ApiPointDTO dataPoint = dataPointApi.getPointById(columnItem.getParamId()); ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId()); if (dataPoint == null) { return null; } @@ -103,7 +101,7 @@ calendar.setTime(originalTime); switch (columnItem.getParamType()) { case "DATAPOINT": ApiPointDTO dataPoint = dataPointApi.getPointById(columnItem.getParamId()); ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId()); if (dataPoint == null) { return null; } @@ -135,7 +133,7 @@ Integer granularity = 60; switch (columnItem.getParamType()) { case "DATAPOINT": ApiPointDTO dataPoint = dataPointApi.getPointById(columnItem.getParamId()); ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId()); granularity = DataPointFreq.getEumByCode(dataPoint.getMinfreqid()).getValue(); break; case "PREDICTITEM":
