From 7e40556d7f7448ac05e199c2fb5c9a98b47cbab7 Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Tue, 24 Sep 2024 17:10:57 +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

---
 .../service/impl/ExperimentServiceImpl.java   | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

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 6f0947eb..ecfa21b5 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
@@ -501,6 +501,10 @@ public class ExperimentServiceImpl implements ExperimentService {
 
         while (dependendcyIterator.hasNext()) {
             ModelsVo modelMetaVo = new ModelsVo();
+            modelMetaVo.setOwner(gitLinkUsername);
+            ModelDependency1 modelDependency = new ModelDependency1();
+            modelDependency.setOwner(gitLinkUsername);
+            modelDependency.setState(Constant.State_building);
 
             Map.Entry<String, Object> entry = dependendcyIterator.next();
             Map<String, Object> modelDel = (Map<String, Object>) entry.getValue();
@@ -554,6 +558,7 @@ public class ExperimentServiceImpl implements ExperimentService {
                 }
                 modelMetaVo.setTrainDatasets(trainDatasets);
             }
+
             //训练任务
             TrainTaskDepency trainTask = new TrainTaskDepency();
             trainTask.setWorkflowId(workflowId);
@@ -578,9 +583,6 @@ public class ExperimentServiceImpl implements ExperimentService {
                 String parentModel = JSON.toJSONString(map);
                 modelMetaVo.setParentModel(parentModel);
 
-                ModelDependency1 modelDependency = new ModelDependency1();
-                modelDependency.setOwner(gitLinkUsername);
-                modelDependency.setState(Constant.State_building);
                 modelDependency.setParentModel(parentModel);
                 modelDependency.setMeta(JSON.toJSONString(modelMetaVo));
                 modelDependency1Dao.insert(modelDependency);
@@ -607,7 +609,6 @@ public class ExperimentServiceImpl implements ExperimentService {
             }
 
             //处理target数据
-            modelMetaVo.setOwner(gitLinkUsername);
             if (target != null) {
                 for (int i = 0; i < target.size(); i++) {
                     Map<String, Object> targetMap = target.get(i);
@@ -622,26 +623,22 @@ public class ExperimentServiceImpl implements ExperimentService {
                         modelMetaVo.setIdentifier((String) targetModel.get("model_identifier"));
                         modelMetaVo.setName((String) targetModel.get("model_name"));
                         modelMetaVo.setVersion((String) targetModel.get("model_version"));
-                        modelMetaVo.setOwner(gitLinkUsername);
-
-                        List<VersionVo> versionVos = new ArrayList<>();
-                        for (Map<String, Object> outputFile : outputList) {
-                            String path = (String) outputFile.get("path");
-                            List<Map<String, Object>> files = FileUtil.getFiles(path);
-                            for (Map<String, Object> fileDetail : files) {
-                                VersionVo versionVo = new VersionVo();
-                                versionVo.setUrl((String) fileDetail.get("filePath"));
-                                versionVo.setFileName((String) fileDetail.get("fileName"));
-                                long size = (long) fileDetail.get("size");
-                                versionVo.setFileSize(FileUtil.formatFileSize(size));
-                                versionVos.add(versionVo);
-                            }
-                        }
-                        modelMetaVo.setModelVersionVos(versionVos);
 
-                        ModelDependency1 modelDependency = new ModelDependency1();
-                        modelDependency.setOwner(gitLinkUsername);
-                        modelDependency.setState(Constant.State_building);
+//                        List<VersionVo> versionVos = new ArrayList<>();
+//                        for (Map<String, Object> outputFile : outputList) {
+//                            String path = (String) outputFile.get("path");
+//                            List<Map<String, Object>> files = FileUtil.getFiles(path);
+//                            for (Map<String, Object> fileDetail : files) {
+//                                VersionVo versionVo = new VersionVo();
+//                                versionVo.setUrl((String) fileDetail.get("filePath"));
+//                                versionVo.setFileName((String) fileDetail.get("fileName"));
+//                                long size = (long) fileDetail.get("size");
+//                                versionVo.setFileSize(FileUtil.formatFileSize(size));
+//                                versionVos.add(versionVo);
+//                            }
+//                        }
+//                        modelMetaVo.setModelVersionVos(versionVos);
+
                         modelDependency.setRepoId(Integer.valueOf((String) targetModel.get("model_id")));
                         modelDependency.setIdentifier((String) targetModel.get("model_identifier"));
                         modelDependency.setVersion((String) targetModel.get("model_version"));