From 3cd11e2c45e6d5ad7aeef3a17e74d73529d3e2ad Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Tue, 24 Sep 2024 14:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=A8=A1=E5=9E=8B=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=85=83=E6=95=B0=E6=8D=AE=E8=AE=B0=E5=BD=95=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/dependencydomain/TrainTaskDepency.java         | 2 +-
 .../platform/service/impl/ExperimentServiceImpl.java      | 8 ++++----
 .../src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java
index 841d0845..803ccdbe 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java
@@ -13,7 +13,7 @@ public class TrainTaskDepency  implements Serializable {
     //实例id
     private Integer insId;
     //节点Id
-    private String taskId;
+    private Long workflowId;
 
     private Integer experimentId;
 }
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
index 895e09d4..eca66050 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
@@ -296,7 +296,7 @@ public class ExperimentServiceImpl implements ExperimentService {
             ExperimentIns insert = experimentInsService.insert(experimentIns);
             //插入到模型依赖关系表
             if (dependendcy != null && trainInfo != null) {
-                insertModelDependencyNew(dependendcy, trainInfo, output, insert.getMetricRecord(), insert.getId(), experiment.getId(), experiment.getName(), experiment.getGlobalParam());
+                insertModelDependencyNew(dependendcy, trainInfo, output, insert.getMetricRecord(), insert.getId(), workflow.getId(), experiment.getId(), experiment.getName(), experiment.getGlobalParam());
             }
 
             Map<String, Object> datasetDependendcy = (Map<String, Object>) converMap2.get("dataset_dependency");
@@ -401,7 +401,7 @@ public class ExperimentServiceImpl implements ExperimentService {
             //训练数据集
             modelDependency.setTrainDataset(JsonUtils.objectToJson(datasetsList));
             TrainTaskDepency trainTaskDepency = new TrainTaskDepency();
-            trainTaskDepency.setTaskId(sourceTaskId);
+//            trainTaskDepency.setTaskId(sourceTaskId);
             trainTaskDepency.setInsId(experimentInsId);
             trainTaskDepency.setName(experimentName);
             //训练任务
@@ -490,7 +490,7 @@ public class ExperimentServiceImpl implements ExperimentService {
 
     }
 
-    private void insertModelDependencyNew(Map<String, Object> dependendcy, Map<String, Object> trainInfo, Map<String, Object> output, String metricRecord, Integer experimentInsId, Integer experimentId, String experimentName, String globalParam) {
+    private void insertModelDependencyNew(Map<String, Object> dependendcy, Map<String, Object> trainInfo, Map<String, Object> output, String metricRecord, Integer experimentInsId, Long workflowId, Integer experimentId, String experimentName, String globalParam) {
         Iterator<Map.Entry<String, Object>> dependendcyIterator = dependendcy.entrySet().iterator();
         Map<String, Object> modelTrain = (Map<String, Object>) trainInfo.get("model_train");
         Map<String, Object> modelEvaluate = (Map<String, Object>) trainInfo.get("model_evaluate");
@@ -570,7 +570,7 @@ public class ExperimentServiceImpl implements ExperimentService {
             }
             //训练任务
             TrainTaskDepency trainTask = new TrainTaskDepency();
-            trainTask.setTaskId(sourceTaskId);
+            trainTask.setWorkflowId(workflowId);
             trainTask.setInsId(experimentInsId);
             trainTask.setName(experimentName);
             trainTask.setExperimentId(experimentId);
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java
index cbfdf760..e1b84905 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java
@@ -41,8 +41,8 @@ public class ModelMetaVo implements Serializable {
     @ApiModelProperty(value = "训练镜像")
     private String image;
 
-    @ApiModelProperty(value = "训练代码")
-    private String code;
+//    @ApiModelProperty(value = "训练代码")
+//    private String code;
 
     @ApiModelProperty(value = "模型来源")
     private String modelSource;