From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 27 二月 2025 16:00:28 +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/SampleConstructor.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 e42c921..d2c8240 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
@@ -1,5 +1,6 @@
package com.iailab.module.model.mdk.sample;
+import com.iailab.module.model.mdk.vo.StAdjustDeviationDTO;
import com.iailab.module.model.mdk.common.exceptions.ModelInvokeException;
import com.iailab.module.model.mdk.sample.dto.SampleData;
import com.iailab.module.model.mdk.sample.dto.SampleInfo;
@@ -10,6 +11,7 @@
import java.text.MessageFormat;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 样本构造
@@ -25,11 +27,30 @@
@Autowired
private SampleFactory sampleFactory;
- public List<SampleData> constructSample(String typeA, String modelId, Date runTime,String itemName) 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);
- SampleDataConstructor sampleDataConstructor = sampleFactory.createSampelData(typeA);
+ 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, List<StAdjustDeviationDTO> deviationList) throws ModelInvokeException {
+ try {
+ SampleInfoConstructor sampleInfoConstructor = sampleFactory.createSampleInfo(typeA, modelId);
+ SampleInfo sampleInfo = sampleInfoConstructor.prepareSampleInfo(modelId, runTime, dynamicDataLength);
+ sampleInfo.setDeviation(deviationList);
+ SampleDataConstructor sampleDataConstructor = sampleFactory.createSampleData(typeA);
return sampleDataConstructor.prepareSampleData(sampleInfo);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3