From b4b4596887770a34f80c31ab849068893094dab5 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 24 二月 2025 10:47:08 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleConstructor.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleConstructor.java
index b4a0756..c50083b 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleConstructor.java
@@ -28,21 +28,29 @@
@Autowired
private SampleFactory sampleFactory;
- public List<SampleData> constructSample(String typeA, String modelId, Date runTime,String itemName, Map<Integer, Integer> dynamicDataLength) throws ModelInvokeException {
+ public List<SampleData> constructSample(String typeA, String modelId, Date runTime,String itemName,
+ Map<Integer, Integer> dynamicDataLength) throws ModelInvokeException {
try {
SampleInfoConstructor sampleInfoConstructor = sampleFactory.createSampleInfo(typeA, modelId);
- SampleInfo sampleInfo = sampleInfoConstructor.prepareSampleInfo(modelId, runTime);
- if (!CollectionUtils.isEmpty(dynamicDataLength) && sampleInfo.getColumnInfo() != null) {
- for(ColumnItemPort columnInfo : sampleInfo.getColumnInfo()) {
- if (!dynamicDataLength.containsKey(columnInfo.getPortOrder())) {
- continue;
- }
- columnInfo.setDataLength(dynamicDataLength.get(columnInfo.getPortOrder()));
- columnInfo.getColumnItemList().forEach(columnItem -> {
- columnItem.setDataLength(columnInfo.getDataLength());
- });
- }
- }
+ SampleInfo sampleInfo = sampleInfoConstructor.prepareSampleInfo(modelId, runTime, dynamicDataLength);
+ SampleDataConstructor sampleDataConstructor = sampleFactory.createSampleData(typeA);
+ return sampleDataConstructor.prepareSampleData(sampleInfo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("获取模型的算法参数异常",e);
+ throw new ModelInvokeException(MessageFormat.format("{0},Name:{1}",
+ ModelInvokeException.errorGetModelArithParam, itemName));
+ }
+
+
+ }
+
+ public List<SampleData> constructSample(String typeA, String modelId, Date runTime,String itemName,
+ Map<Integer, Integer> dynamicDataLength, double[][] deviation) throws ModelInvokeException {
+ try {
+ SampleInfoConstructor sampleInfoConstructor = sampleFactory.createSampleInfo(typeA, modelId);
+ SampleInfo sampleInfo = sampleInfoConstructor.prepareSampleInfo(modelId, runTime, dynamicDataLength);
+ sampleInfo.setDeviation(deviation);
SampleDataConstructor sampleDataConstructor = sampleFactory.createSampleData(typeA);
return sampleDataConstructor.prepareSampleData(sampleInfo);
} catch (Exception e) {
--
Gitblit v1.9.3