From db5d4e125ea3a57884e4cb70696f240b5f8ae389 Mon Sep 17 00:00:00 2001
From: fanshuai <1141904845@qq.com>
Date: Sun, 29 Sep 2024 10:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=82=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NewDatasetServiceImpl.java   | 25 ++++---------------
 .../com/ruoyi/platform/vo/NewDatasetVo.java   |  5 ++--
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
index 77087726..e67e16a3 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
@@ -209,21 +209,6 @@ 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);
-                Map<String, Object> preprocessCode = (Map<String, Object>)  sourceMap.get("preprocess_code");
-                datasetVo.setProcessingCode(JacksonUtil.toJSONString(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")));
@@ -520,12 +505,12 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         queryDatasetTempStorage.setVersion(datasetVo.getVersion());
         DatasetTempStorage datasetTempStorage = datasetTempStorageService.queryByDatasetTempStorage(queryDatasetTempStorage);
         if (datasetTempStorage != null) {
-            String datasetSourceString = datasetTempStorage.getSource();
-            Map<String, Object> datasetSourceMap = JacksonUtil.parseJSONStr2Map(datasetSourceString);
-            String preprocessCode = (String) datasetSourceMap.get("preprocess_code");
-            datasetSourceMap.remove("preprocess_code");
+            String source = datasetTempStorage.getSource();
+            Map<String, Object> sourceMap = JacksonUtil.parseJSONStr2Map(source);
+            Map<String, Object> preprocessCode = (Map<String, Object>)  sourceMap.get("preprocess_code");
             datasetVo.setProcessingCode(preprocessCode);
-            datasetVo.setDatasetSource(JacksonUtil.toJSONString(datasetSourceMap));
+            sourceMap.remove("preprocess_code");
+            datasetVo.setTrainTask(sourceMap);
             datasetTempStorage.setState(0);
             datasetTempStorageService.update(datasetTempStorage);
         }
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java
index 49e5a5ec..60cfff21 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java
@@ -8,6 +8,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
 @Data
@@ -55,9 +56,9 @@ public class NewDatasetVo implements Serializable {
     @ApiModelProperty(name = "update_time",value = "更新时间")
     private String updateTime;
     @ApiModelProperty(name = "processing_code",value = "处理代码")
-    private String processingCode;
+    private Map processingCode;
     @ApiModelProperty(name = "train_task",value = "训练任务")
-    private String trainTask;
+    private Map trainTask;
     @ApiModelProperty(name = "owner",value = "项目所有者")
     private String owner;
     @ApiModelProperty(name = "dataset_source",value = "数据集来源")