From b651cbfd94d8d636c01b61e483ed1cff98e1bcb9 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 16:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java |   37 ++++++++++++++++---------------------
 1 files changed, 16 insertions(+), 21 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..3f8f72b 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);
 
     /**
      * 样本的采样周期
@@ -92,7 +86,7 @@
      * @return
      * @throws Exception
      */
-    protected Date getStartTime(ColumnItem columnItem, Date originalTime, Map<String, ApiPointDTO> pointMap) {
+    protected Date getStartTime(ColumnItem columnItem, Date originalTime, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
         Date dateTime = new Date();
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(originalTime);
@@ -112,7 +106,11 @@
                 dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), 60);
                 break;
             case PLAN:
-                dateTime = calendar.getTime();
+                ApiPlanItemDTO apiPlanItemDTO = planMap.get(columnItem.getParamId());
+                if (apiPlanItemDTO == null) {
+                    return null;
+                }
+                dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), TimeGranularitySecEnum.getEumByCode(apiPlanItemDTO.getTimeGranularity()).getValue());
                 break;
             default:
                 break;
@@ -128,7 +126,7 @@
      * @return
      * @throws Exception
      */
-    protected Date getEndTime(ColumnItem columnItem, Date originalTime,Map<String, ApiPointDTO> pointMap) {
+    protected Date getEndTime(ColumnItem columnItem, Date originalTime,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
         Date dateTime = new Date();
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(originalTime);
@@ -148,12 +146,11 @@
                 dateTime = calendar.getTime();
                 break;
             case PLAN:
-                ApiPlanItemDTO planItem = planItemApi.getInfoByNo(columnItem.getParamId());
-                if (planItem == null) {
+                ApiPlanItemDTO apiPlanItemDTO = planMap.get(columnItem.getParamId());
+                if (apiPlanItemDTO == null) {
                     return null;
                 }
-                dateTime = calculateDate(originalTime, false, columnItem.getDataLength(),
-                        TimeGranularityEnum.getEumByCode(planItem.getTimeGranularity()).getValue());
+                dateTime = calculateDate(originalTime, false, columnItem.getDataLength(), TimeGranularitySecEnum.getEumByCode(apiPlanItemDTO.getTimeGranularity()).getValue());
                 break;
             default:
                 break;
@@ -168,26 +165,24 @@
      * @return
      * @throws Exception
      */
-    protected Integer getGranularity(ColumnItem columnItem) {
+    protected Integer getGranularity(ColumnItem columnItem,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
         // 默认60s
         Integer granularity = 60;
         switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
             case DATAPOINT:
-                ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
+                ApiPointDTO dataPoint = pointMap.get(columnItem.getParamId());
                 granularity = DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue();
                 break;
             case NORMALITEM:
-                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());
                 granularity = TimeGranularitySecEnum.getEumByCode(indItemDTO.getTimeGranularity()).getValue();;
                 break;
             case PLAN:
-                ApiPlanItemDTO apiPlanItemDTO = planItemApi.getInfoById(columnItem.getParamId());
+                ApiPlanItemDTO apiPlanItemDTO = planMap.get(columnItem.getParamId());
                 granularity = TimeGranularitySecEnum.getEumByCode(apiPlanItemDTO.getTimeGranularity()).getValue();
                 break;
             default:

--
Gitblit v1.9.3