From afd6dfbd0029e9a758d7896500d54d265f4185fc Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 17 三月 2025 16:22:37 +0800
Subject: [PATCH] long oneMin = granularity * 1000L
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
index 9968c29..b08e5a7 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
@@ -89,7 +89,7 @@
}
}
- int portIdx = 0;
+ int portIdx = 1;
//对每个爪分别进行计算
for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
double[][] matrix = new double[0][0];
@@ -136,28 +136,24 @@
try {
List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap, indMap);
- double adjustVal = SampleInfo.getAdjustValueFromDeviation(portIdx, i, sampleInfo.getDeviation());
- if (adjustVal != 0) {
- logger.info("设置调整值adjustVal:" + adjustVal);
- for (int dataKey = 1; dataKey < dataEntityList.size(); dataKey++) {
- DataValueVO item = dataEntityList.get(dataKey);
- item.setDataValue(item.getDataValue() + adjustVal);
- }
- }
-
//补全数据
ColumnItem columnItem = entry.getColumnItemList().get(i);
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++) {
- Double dataValue = dataEntityList.get(k).getDataValue();
- if (null != dataValue) {
- matrix[k][i] = dataValue;
- }
+ if (CollectionUtils.isEmpty(dataEntityList)) {
+ continue;
+ }
+ logger.info("设置matrix, i = " + i + ", size = " + dataEntityList.size());
+ // 调整值
+ double adjustVal = SampleInfo.getAdjustValueFromDeviation(portIdx, i + 1, sampleInfo.getDeviation());
+ for (int k = 0; k < dataEntityList.size(); k++) {
+ Double dataValue = dataEntityList.get(k).getDataValue();
+ if (null == dataValue) {
+ continue;
}
+ // 用BigDecimal计算，解决double精度问题
+ matrix[k][i] = BigDecimal.valueOf(dataValue).add(BigDecimal.valueOf(adjustVal)).doubleValue();
}
} catch (Exception e) {
e.printStackTrace();
@@ -206,8 +202,12 @@
break;
case NORMALITEM:
case MERGEITEM:
- List<DataValueVO> predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
-
+ 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());
+ }
if (CollectionUtils.isEmpty(predictValue)) {
break;
}
--
Gitblit v1.9.3