From af5604110b6958af57b7de8fcd70acbc81de419c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 20 一月 2025 17:47:35 +0800
Subject: [PATCH] break

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java |  100 ++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
index e9443ca..2ddb9c6 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
@@ -1,11 +1,20 @@
 package com.iailab.module.model.mdk.sample;
 
+import cn.hutool.core.date.DateUtil;
+import com.iailab.module.data.api.ind.IndItemApi;
+import com.iailab.module.data.api.ind.dto.ApiIndItemDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
+import com.iailab.module.data.api.plan.PlanItemApi;
+import com.iailab.module.data.api.plan.dto.ApiPlanItemDTO;
 import com.iailab.module.data.api.point.DataPointApi;
 import com.iailab.module.data.api.point.dto.ApiPointDTO;
 import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
 import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
-import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
+import com.iailab.module.data.common.ApiDataQueryDTO;
+import com.iailab.module.data.common.ApiDataValueDTO;
 import com.iailab.module.model.mcs.pre.service.MmItemOutputService;
+import com.iailab.module.model.mcs.pre.service.MmItemResultJsonService;
 import com.iailab.module.model.mcs.pre.service.MmItemResultService;
 import com.iailab.module.model.mcs.pre.service.MmItemTypeService;
 import com.iailab.module.model.mdk.common.enums.ModelParamType;
@@ -14,18 +23,20 @@
 import com.iailab.module.model.mdk.sample.dto.SampleData;
 import com.iailab.module.model.mdk.sample.dto.SampleInfo;
 import com.iailab.module.model.mdk.vo.DataValueVO;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
 /**
  * 预测样本数据构造
  */
+@Slf4j
 @Component
 public class PredictSampleDataConstructor extends SampleDataConstructor {
 
@@ -35,7 +46,16 @@
     private DataPointApi dataPointApi;
 
     @Autowired
+    private PlanItemApi planItemApi;
+
+    @Autowired
+    private IndItemApi indItemApi;
+
+    @Autowired
     private MmItemResultService mmItemResultService;
+
+    @Autowired
+    private MmItemResultJsonService mmItemResultJsonService;
 
     @Autowired
     private MmItemTypeService mmItemTypeService;
@@ -51,8 +71,11 @@
      * @return
      */
     @Override
-    public List<SampleData> prepareSampleData(SampleInfo sampleInfo) {
+    public List<SampleData> prepareSampleData(SampleInfo sampleInfo) throws Exception {
         List<SampleData> sampleDataList = new ArrayList<>();
+        Map<String, ApiPointDTO> pointMap = sampleInfo.getPointMap();
+        Map<String, ApiPlanItemDTO> planMap = sampleInfo.getPlanMap();
+        Map<String, ApiIndItemDTO> indMap = sampleInfo.getIndMap();
         //对每个爪分别进行计算
         for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
             //先依据爪内数据项的modelParamOrder进行排序——重写comparator匿名函数
@@ -74,21 +97,24 @@
             //对每一项依次进行数据查询,然后将查询出的值赋给matrix对应的位置
             for (int i = 0; i < entry.getColumnItemList().size(); i++) {
                 try {
-                    List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i));
+                    List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap,indMap);
                     //补全数据
                     ColumnItem columnItem = entry.getColumnItemList().get(i);
-                    dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime,
-                            columnItem.paramId, columnItem.getParamType());
+                    dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(),columnItem.getGranularity());
 
                     /** 如果数据取不满,把缺失的数据点放在后面 */
                     if (dataEntityList != null && dataEntityList.size() != 0) {
                         logger.info("设置matrix, i = " + i + ", size = " + dataEntityList.size());
                         for (int k = 0; k < dataEntityList.size(); k++) {
-                            matrix[k][i] = dataEntityList.get(k).getDataValue();
+                            Double dataValue = dataEntityList.get(k).getDataValue();
+                            if (null != dataValue) {
+                                matrix[k][i] = dataValue;
+                            }
                         }
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
+                    throw e;
                 }
             }
             SampleData sampleData = new SampleData();
@@ -102,20 +128,25 @@
      * getData
      *
      * @param columnItem
+     * @param pointMap
+     * @param planMap
+     * @param indMap
      * @return
      * @throws Exception
      */
-    private List<DataValueVO> getData(ColumnItem columnItem) throws Exception {
+    private List<DataValueVO> getData(ColumnItem columnItem, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap, Map<String, ApiIndItemDTO> indMap) throws Exception {
         List<DataValueVO> dataList = new ArrayList<>();
         String paramType = columnItem.getParamType();
         switch (ModelParamType.getEumByCode(paramType)) {
             case DATAPOINT:
-                ApiPointDTO point = dataPointApi.getInfoById(columnItem.getParamId());
                 ApiPointValueQueryDTO queryDto = new ApiPointValueQueryDTO();
-                queryDto.setPointNo(point.getPointNo());
+                queryDto.setPointNo(pointMap.get(columnItem.getParamId()).getPointNo());
                 queryDto.setStart(columnItem.getStartTime());
                 queryDto.setEnd(columnItem.getEndTime());
                 List<ApiPointValueDTO> pointValueList = dataPointApi.queryPointHistoryValue(queryDto);
+                if (CollectionUtils.isEmpty(pointValueList)) {
+                    break;
+                }
                 dataList = pointValueList.stream().map(t -> {
                     DataValueVO vo = new DataValueVO();
                     vo.setDataTime(t.getT());
@@ -123,17 +154,54 @@
                     return vo;
                 }).collect(Collectors.toList());
                 break;
-            case PREDICTITEM:
-                MmItemOutputEntity outPut = mmItemOutputService.getOutPutById(columnItem.getId());
-                dataList = mmItemResultService.getPredictValue(outPut.getId(),
-                        columnItem.getStartTime(), columnItem.getEndTime());
-                if (dataList == null) {
-                    throw new Exception("没有预测值");
+            case NORMALITEM:
+            case MERGEITEM:
+                List<DataValueVO> predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
+
+                if (CollectionUtils.isEmpty(predictValue)) {
+                    break;
                 }
+                dataList = predictValue;
                 break;
+            case PLAN:
+                ApiDataQueryDTO queryPlanItemDto = new ApiDataQueryDTO();
+                queryPlanItemDto.setItemNo(planMap.get(columnItem.getParamId()).getItemNo());
+                queryPlanItemDto.setStart(columnItem.getStartTime());
+                queryPlanItemDto.setEnd(columnItem.getEndTime());
+                List<ApiDataValueDTO> planValueList = planItemApi.queryPlanItemHistoryValue(queryPlanItemDto);
+                if (CollectionUtils.isEmpty(planValueList)) {
+                    break;
+                }
+                dataList = planValueList.stream().map(t -> {
+                    DataValueVO vo = new DataValueVO();
+                    vo.setDataTime(t.getDataTime());
+                    vo.setDataValue(t.getDataValue());
+                    return vo;
+                }).collect(Collectors.toList());
+                break;
+            case IND:
+                ApiIndItemQueryDTO queryIndItemDTO = new ApiIndItemQueryDTO();
+                ApiIndItemDTO intItem = indMap.get(columnItem.getParamId());
+                queryIndItemDTO.setItemNo(intItem.getItemNo());
+                queryIndItemDTO.setStart(columnItem.getStartTime());
+                queryIndItemDTO.setEnd(columnItem.getEndTime());
+                List<ApiIndItemValueDTO> indItemValueList = indItemApi.queryIndItemHistoryValue(queryIndItemDTO);
+                if (CollectionUtils.isEmpty(indItemValueList)) {
+                    break;
+                }
+
+                dataList = indItemValueList.stream().map(t -> {
+                    DataValueVO vo = new DataValueVO();
+                    vo.setDataTime(DateUtil.parse(t.getDataTime()));
+                    vo.setDataValue(t.getDataValue());
+                    return vo;
+                }).collect(Collectors.toList());
             default:
                 break;
         }
+        // 避免生产环境日志过多,分级打印
+        log.debug("数据获取,columnItem:" + columnItem + ",dataList:" + dataList);
+        log.info("数据获取,columnItem:" + columnItem + ",dataListLength:" + dataList.size());
         return dataList;
     }
 }

--
Gitblit v1.9.3