From d22d56c90fc74831bf379ce063e38945e4833076 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 17 一月 2025 10:59:45 +0800
Subject: [PATCH] 模型数据分析
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java | 6 ++++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 8 +++++++-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/InfluxDBService.java | 1 +
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index e8a8aa5..cdc43e1 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -155,7 +155,13 @@
}
Date predictTime = reqVO.getPredictTime();
if (predictTime == null) {
- MmItemOutputEntity output = mmItemOutputService.getOutPutById(reqVO.getOutIds().get(0));
+ MmItemOutputEntity output = null;
+ for (String outId : outIds) {
+ output = mmItemOutputService.getOutPutById(outId);
+ if (output != null) {
+ break;
+ }
+ }
ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(output.getItemid());
if (predictItem.getLastTime() != null) {
predictTime = predictItem.getLastTime();
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/InfluxDBService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/InfluxDBService.java
index 532b170..2676343 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/InfluxDBService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/influxdb/service/InfluxDBService.java
@@ -16,5 +16,6 @@
void asyncWriteModelResults(List<InfluxModelResultPOJO> pointValues);
List<InfluxModelResultVO> queryModelResults(InfluxModelResultPOJO pojo, Date startTime, Date endTime);
+
Map<String,List<InfluxModelResultVO>> queryModelResultsByOutPutIds(InfluxModelResultByOutPutIdsPOJO pojo, Date startTime, Date endTime);
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
index 2b25ec0..ff058ab 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
@@ -110,7 +110,9 @@
return outputMap.get(outputid);
}
MmItemOutputEntity entity = mmItemOutputDao.selectById(outputid);
- outputMap.put(outputid, entity);
- return entity;
+ if (entity != null) {
+ outputMap.put(outputid, entity);
+ }
+ return outputMap.get(outputid);
}
}
--
Gitblit v1.9.3