From 50084de4a140dece61019b64fd91df041d242e47 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 23 十二月 2024 15:28:53 +0800
Subject: [PATCH] getInfoByIds(Set<String> pointIds) 模型输入计划数据获取、补全 模型输入mergeitem存默认生成的outputid sampleInfo.setPointMap 避免重复查询point

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
index 515637b..1ed6feb 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
@@ -48,14 +48,8 @@
      * @return
      */
     protected SampleInfo prepareSampleInfo(String modelId, Date predictTime) {
-        SampleInfo sampleInfo = new SampleInfo();
-        //调用样本列数的方法
-//        sampleInfo.setSampleColumn(getSampleColumn(modelId));
         //样本的列信息
-        sampleInfo.setColumnInfo(getColumnInfo(modelId, predictTime));
-        //样本的采样周期
-//        sampleInfo.setSampleCycle(getSampleCycle(modelId));
-        return sampleInfo;
+        return getColumnInfo(modelId, predictTime);
     }
 
     /**
@@ -74,7 +68,7 @@
      * @param predictTime
      * @return
      */
-    protected abstract List<ColumnItemPort> getColumnInfo(String modelId, Date predictTime);
+    protected abstract SampleInfo getColumnInfo(String modelId, Date predictTime);
 
     /**
      * 样本的采样周期
@@ -180,7 +174,7 @@
                 granularity = mmPredictItemService.getItemByOutPutId(columnItem.getParamId()).getGranularity();
                 break;
             case MERGEITEM:
-                granularity = mmPredictItemService.getItemByIdFromCache(columnItem.getParamId()).getGranularity();
+                granularity = mmPredictItemService.getItemByOutPutId(columnItem.getParamId()).getGranularity();
                 break;
             case IND:
                 ApiIndItemDTO indItemDTO = indItemApi.getInfoById(columnItem.getParamId());

--
Gitblit v1.9.3