From 1ab11991a6bc2b0496c83cb969b0f5bc6f22a309 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 20 二月 2025 11:22:42 +0800
Subject: [PATCH] 模型输入添加IND_ASCII类型,用于输入字符串类型数据

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java |   49 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java
index 0be1977..a5fd90d 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java
@@ -1,5 +1,9 @@
 package com.iailab.module.model.mdk.sample;
 
+import com.iailab.module.data.api.ind.IndItemApi;
+import com.iailab.module.data.api.ind.dto.ApiIndItemDTO;
+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.model.mcs.pre.entity.MmModelParamEntity;
@@ -9,14 +13,12 @@
 import com.iailab.module.model.mdk.common.enums.ModelParamType;
 import com.iailab.module.model.mdk.sample.dto.ColumnItem;
 import com.iailab.module.model.mdk.sample.dto.ColumnItemPort;
+import com.iailab.module.model.mdk.sample.dto.SampleInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -40,6 +42,12 @@
     @Autowired
     private DataPointApi dataPointApi;
 
+    @Autowired
+    private PlanItemApi planItemApi;
+
+    @Autowired
+    private IndItemApi indItemApi;
+
     /**
      * 返回样本矩阵的列数
      *
@@ -59,7 +67,8 @@
      * @return
      */
     @Override
-    protected List<ColumnItemPort> getColumnInfo(String modelId, Date predictTime) {
+    protected SampleInfo getColumnInfo(String modelId, Date predictTime, Map<Integer, Integer> dynamicDataLength) {
+        SampleInfo sampleInfo = new SampleInfo();
         List<ColumnItemPort> resultList = new ArrayList<>();
         List<ColumnItem> columnItemList = new ArrayList<>();
         ColumnItem columnInfo = new ColumnItem();
@@ -71,24 +80,32 @@
         //设置当前端口号,初始值为最小端口(查询结果按端口号从小到达排列)
         int curPortOrder = modelInputParamEntityList.get(0).getModelparamportorder();
         //设置当前查询数据长度,初始值为最小端口数据长度
-        int curDataLength = modelInputParamEntityList.get(0).getDatalength();
+        int curDataLength = super.getDataLength(dynamicDataLength, curPortOrder, modelInputParamEntityList.get(0).getDatalength());
         // 统一获取测点的信息
-        List<String> pointIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.DATAPOINT)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toList());
+        Set<String> pointIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.DATAPOINT)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toSet());
         List<ApiPointDTO> points = dataPointApi.getInfoByIds(pointIds);
-        Map<String, ApiPointDTO> pointMap = points.stream().collect(Collectors.toMap(ApiPointDTO::getId, Function.identity()));
+        Map<String, ApiPointDTO> pointMap = points.stream().collect(Collectors.toMap(ApiPointDTO::getId, Function.identity(), (e1, e2) -> e1));
+        // 统一获取计划数据的信息
+        Set<String> planIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.PLAN)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toSet());
+        List<ApiPlanItemDTO> plans = planItemApi.getInfoByIds(planIds);
+        Map<String, ApiPlanItemDTO> planMap = plans.stream().collect(Collectors.toMap(ApiPlanItemDTO::getId, Function.identity(), (e1, e2) -> e1));
+        // 统一获取指标数据的信息
+        Set<String> indIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.IND) || ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.IND_ASCII)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toSet());
+        List<ApiIndItemDTO> inds = indItemApi.getInfoByIds(indIds);
+        Map<String, ApiIndItemDTO> indMap = inds.stream().collect(Collectors.toMap(ApiIndItemDTO::getId, Function.identity(), (e1, e2) -> e1));
 
         for (MmModelParamEntity entry : modelInputParamEntityList) {
             columnInfo.setParamType(entry.getModelparamtype());
             columnInfo.setParamId(entry.getModelparamid());
-            columnInfo.setDataLength(entry.getDatalength());
+            columnInfo.setDataLength(super.getDataLength(dynamicDataLength, entry.getModelparamportorder(), entry.getDatalength()));
             columnInfo.setModelParamOrder(entry.getModelparamorder());
             columnInfo.setModelParamPortOrder(entry.getModelparamportorder());
-            columnInfo.setStartTime(getStartTime(columnInfo, predictTime,pointMap));
-            columnInfo.setEndTime(getEndTime(columnInfo, predictTime,pointMap));
-            columnInfo.setGranularity(super.getGranularity(columnInfo));
+            columnInfo.setGranularity(super.getGranularity(columnInfo, pointMap, planMap,indMap));
+            columnInfo.setStartTime(getStartTime(columnInfo, predictTime));
+            columnInfo.setEndTime(getEndTime(columnInfo, predictTime));
 
             //对每一个爪进行数据项归并
-            if (curPortOrder != entry.getModelparamportorder()){
+            if (curPortOrder != entry.getModelparamportorder()) {
                 //当数据项端口号不为当前端口号时,封装上一个端口类,操作下一个端口类
                 curPort.setColumnItemList(columnItemList);
                 curPort.setDataLength(curDataLength);
@@ -108,7 +125,11 @@
         curPort.setDataLength(curDataLength);
         curPort.setPortOrder(curPortOrder);
         resultList.add(curPort);
-        return resultList;
+        sampleInfo.setColumnInfo(resultList);
+        sampleInfo.setPointMap(pointMap);
+        sampleInfo.setPlanMap(planMap);
+        sampleInfo.setIndMap(indMap);
+        return sampleInfo;
     }
 
     /**

--
Gitblit v1.9.3