From 5f614dec95ae76eff3942508b175505dff1502d0 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 04 三月 2025 09:49:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java
index d0cfb77..8511269 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java
@@ -118,7 +118,7 @@
         }
     }
 
-    public void predictAdjust(ItemVO predictItem, Date predictTime, List<StAdjustDeviationDTO> deviationList, String scheduleModelId) {
+    public void predictAdjust(ItemVO predictItem, Date predictTime, List<StAdjustDeviationDTO> deviationList, String scheduleModelId, String configId) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(predictTime);
         calendar.set(Calendar.MILLISECOND, 0);
@@ -133,9 +133,11 @@
         try {
             PredictItemHandler predictItemHandler = predictItemFactory.create(predictItem.getId());
             PredictResultVO predictResult = predictItemHandler.predictAdjust(calendar.getTime(), predictItem, deviationList);
+            predictResult.setGranularity(predictItem.getGranularity());
+            predictResult.setSaveIndex(predictItem.getSaveIndex());
 
             // 保存预测结果
-            predictResultHandler.savePredictAdjustResult(predictResult, JSONArray.toJSONString(deviationList), scheduleModelId);
+            predictResultHandler.savePredictAdjustResult(predictResult, JSONArray.toJSONString(deviationList), scheduleModelId,configId);
         } catch (Exception e) {
             e.printStackTrace();
             log.error(MessageFormat.format("预测项编号:{0},预测项名称:{1},预测失败:{2} 预测时刻:{3}",

--
Gitblit v1.9.3