修改入参来源

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java

@@ -302,7 +302,7 @@ public class ExperimentServiceImpl implements ExperimentService {
             Map<String, Object> datasetDependendcy = (Map<String, Object>) converMap2.get("dataset_dependency");
             //暂存数据集元数据{}
             if (datasetDependendcy != null && trainInfo != null) {
-                insertDatasetTempStorage(datasetDependendcy, trainInfo, experiment.getId(), insert.getId(), experiment.getName());
+                insertDatasetTempStorage(datasetDependendcy, trainInfo, experiment.getId(), insert.getId(), experiment.getName(), experiment.getWorkflowId());
             }
 
 
@@ -456,7 +456,7 @@ public class ExperimentServiceImpl implements ExperimentService {
     /**
      * 存储数据集元数据到临时表
      */
-    private void insertDatasetTempStorage(Map<String, Object> datasetDependendcy, Map<String, Object> trainInfo, Integer experimentId, Integer experimentInsId, String experimentName) {
+    private void insertDatasetTempStorage(Map<String, Object> datasetDependendcy, Map<String, Object> trainInfo, Integer experimentId, Integer experimentInsId, String experimentName, Long workflowId) {
         Iterator<Map.Entry<String, Object>> dependendcyIterator = datasetDependendcy.entrySet().iterator();
         Map<String, Object> datasetExport = (Map<String, Object>) trainInfo.get("dataset_export");
         Map<String, Object> datasetPreprocess = (Map<String, Object>) trainInfo.get("general-data-process");
@@ -478,7 +478,7 @@ public class ExperimentServiceImpl implements ExperimentService {
             sourceParams.put("experiment_id", experimentId);
             sourceParams.put("train_name", sourceTaskId);
             sourceParams.put("preprocess_code", projectMap);
-
+            sourceParams.put("workflow_id", workflowId);
             if (target != null && target.size() > 0) {
                 for (Map<String, Object> targetMap : target) {
                     String targetTaskId = (String) targetMap.get("task_id");

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java

@@ -209,6 +209,22 @@ public class NewDatasetServiceImpl implements NewDatasetService {
             dvcUtils.moveFiles(sourcePath, datasetPath);
         }
 
+        if (!StringUtils.equals(datasetVo.getDatasetSource(), Constant.Source_Add)){
+            // 准备数据
+            DatasetTempStorage queryDatasetTempStorage = new DatasetTempStorage();
+            queryDatasetTempStorage.setName(repositoryName);
+            queryDatasetTempStorage.setVersion(branchName);
+            DatasetTempStorage datasetTempStorage = datasetTempStorageService.queryByDatasetTempStorage(queryDatasetTempStorage);
+            if (datasetTempStorage != null){
+                String source = datasetTempStorage.getSource();
+                Map<String, Object> sourceMap = JacksonUtil.parseJSONStr2Map(source);
+                String preprocessCode = (String) sourceMap.get("preprocess_code");
+                datasetVo.setProcessingCode(preprocessCode);
+                sourceMap.remove("preprocess_code");
+                datasetVo.setTrainTask(JacksonUtil.toJSONString(sourceMap));
+            }
+        }
+
         // 拼接生产的元数据后写入yaml文件
         datasetVo.setCreateBy(String.valueOf(StringUtils.isNotEmpty((String) userInfo.get("nickname")) ? userInfo.get("nickname") : userInfo.get("login")));
         datasetVo.setUpdateTime(DateUtils.getTime());

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java

@@ -56,6 +56,8 @@ public class NewDatasetVo implements Serializable {
     private String updateTime;
     @ApiModelProperty(name = "processing_code",value = "处理代码")
     private String processingCode;
+    @ApiModelProperty(name = "train_task",value = "训练任务")
+    private String trainTask;
     @ApiModelProperty(name = "owner",value = "项目所有者")
     private String owner;
     @ApiModelProperty(name = "dataset_source",value = "数据集来源")