From f853b02cb7b265379eceb2f0e3c38f9d63bb1b21 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 17:55:25 +0800
Subject: [PATCH] 执行调度模型 默认时间
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java
index bc58d7b..b3c73a9 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java
@@ -36,7 +36,7 @@
}
@Override
- protected SampleInfo 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<>();
@@ -49,7 +49,7 @@
//设置当前端口号，初始值为最小端口（查询结果按端口号从小到达排列）
int curPortOrder = modelInputParamEntityList.get(0).getModelparamportorder();
//设置当前查询数据长度，初始值为最小端口数据长度
- int curDataLength = modelInputParamEntityList.get(0).getDatalength();
+ int curDataLength = super.getDataLength(dynamicDataLength, curPortOrder, modelInputParamEntityList.get(0).getDatalength());
// 统一获取测点的信息
Set<String> pointIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.DATAPOINT)).map(StScheduleModelParamEntity::getModelparamid).collect(Collectors.toSet());
List<ApiPointDTO> points = dataPointApi.getInfoByIds(pointIds);
@@ -57,20 +57,20 @@
// 统一获取计划数据的信息
Set<String> planIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.PLAN)).map(StScheduleModelParamEntity::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));
+ Map<String, ApiPlanItemDTO> planMap = plans.stream().collect(Collectors.toMap(ApiPlanItemDTO::getId, Function.identity(), (e1, e2) -> e1));
for (StScheduleModelParamEntity 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,planMap));
- columnInfo.setEndTime(getEndTime(columnInfo, predictTime,pointMap,planMap));
- columnInfo.setGranularity(super.getGranularity(columnInfo,pointMap,planMap));
+ columnInfo.setStartTime(getStartTime(columnInfo, predictTime, pointMap, planMap));
+ columnInfo.setEndTime(getEndTime(columnInfo, predictTime, pointMap, planMap));
+ columnInfo.setGranularity(super.getGranularity(columnInfo, pointMap, planMap));
//对每一个爪进行数据项归并
- if (curPortOrder != entry.getModelparamportorder()){
+ if (curPortOrder != entry.getModelparamportorder()) {
//当数据项端口号不为当前端口号时，封装上一个端口类，操作下一个端口类
curPort.setColumnItemList(columnItemList);
curPort.setDataLength(curDataLength);
@@ -79,7 +79,7 @@
curPort = new ColumnItemPort(); //对象重新初始化，防止引用拷贝导致数据覆盖
//封装上一个端口类后更新当前的各个参数
columnItemList = new ArrayList<>();
- curDataLength = entry.getDatalength();
+ curDataLength = super.getDataLength(dynamicDataLength, entry.getModelparamportorder(), entry.getDatalength());
curPortOrder = entry.getModelparamportorder();
}
columnItemList.add(columnInfo);
@@ -101,4 +101,5 @@
return null;
}
+
}
--
Gitblit v1.9.3