From 73b3a394952353c318a8712d2cc1efec03dc009d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 10 四月 2025 16:40:14 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java
index ce85a55..b55cfcf 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.model.common.enums.DataTypeEnum;
+import com.iailab.module.model.influxdb.pojo.InfluxModelResultLastBakSimPOJO;
import com.iailab.module.model.influxdb.pojo.InfluxModelResultLastSimPOJO;
import com.iailab.module.model.influxdb.pojo.InfluxModelResultPOJO;
import com.iailab.module.model.influxdb.pojo.InfluxModelResultSimPOJO;
@@ -36,6 +37,7 @@
public void savePredictValue(Map<String, List<DataValueVO>> predictValueMap, int t, String nIndex, Date predictTime) {
List<InfluxModelResultPOJO> importList = new ArrayList<>();
List<InfluxModelResultPOJO> lastList = new ArrayList<>();
+ List<InfluxModelResultPOJO> lastBakList = new ArrayList<>();
List<MmItemResultJsonEntity> resultJsonList = new ArrayList<>();
for (Map.Entry<String, List<DataValueVO>> entry : predictValueMap.entrySet()) {
@@ -44,7 +46,6 @@
pojo.setValue(dataVo.getDataValue());
pojo.setTimestamp(dataVo.getDataTime().toInstant());
pojo.setOutPutId(entry.getKey());
- pojo.setType(DataTypeEnum.FLOAT.getCode());
importList.add(pojo);
}
@@ -67,8 +68,13 @@
pojo.setValue(dataVo.getDataValue());
pojo.setTimestamp(dataVo.getDataTime().toInstant());
pojo.setOutPutId(entry.getKey());
- pojo.setType(DataTypeEnum.FLOAT.getCode());
lastList.add(pojo);
+
+ InfluxModelResultLastBakSimPOJO bakSimPojo = new InfluxModelResultLastBakSimPOJO();
+ bakSimPojo.setValue(dataVo.getDataValue());
+ bakSimPojo.setTimestamp(dataVo.getDataTime().toInstant());
+ bakSimPojo.setOutPutId(entry.getKey());
+ lastBakList.add(bakSimPojo);
}
MmItemResultJsonEntity resultJson = new MmItemResultJsonEntity();
@@ -85,6 +91,8 @@
// double结果存入influxdb
influxDBService.asyncWriteModelResults(importList);
influxDBService.asyncWriteModelResults(lastList);
+ // t+l备份
+ influxDBService.asyncWriteModelResults(lastBakList);
}
@Override
@@ -139,4 +147,20 @@
});
return result;
}
+
+ @Override
+ public List<Object[]> getData(String outputid, Date startTime, Date endTime, String timeFormat, int decimalPlaces) {
+ List<Object[]> result = new ArrayList<>();
+ InfluxModelResultPOJO pojo = new InfluxModelResultPOJO();
+ pojo.setType(DataTypeEnum.FLOAT.getCode());
+ pojo.setOutPutId(outputid);
+ List<InfluxModelResultVO> influxModelResultVOS = influxDBService.queryModelResults(pojo, startTime, endTime);
+ influxModelResultVOS.forEach(item -> {
+ Object[] dataItem = new Object[2];
+ dataItem[0] = DateUtils.format(Date.from(item.getTimestamp()), timeFormat);
+ dataItem[1] = BigDecimal.valueOf(Double.valueOf(item.getValue().toString())).setScale(decimalPlaces, BigDecimal.ROUND_HALF_UP);
+ result.add(dataItem);
+ });
+ return result;
+ }
}
--
Gitblit v1.9.3