优化终止实验bug

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetTempStorage.java

@@ -1,5 +1,7 @@
 package com.ruoyi.platform.domain;
 
+import lombok.Data;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -9,11 +11,14 @@ import java.io.Serializable;
  * @author makejava
  * @since 2024-09-12 09:42:09
  */
+@Data
 public class DatasetTempStorage implements Serializable {
     private static final long serialVersionUID = -44025176874790480L;
 
     private Integer id;
 
+    private Integer repoId;
+
     private String name;
 
     private String version;
@@ -31,79 +36,5 @@ public class DatasetTempStorage implements Serializable {
     private String updateBy;
 
     private Date updateTime;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
 }
 

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

@@ -451,8 +451,9 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
                     queryMap.put("ins_id", experimentIns.getId());
                     DatasetTempStorage datasetTempStorage = datasetTempStorageDao.queryByInsId(JSON.toJSONString(queryMap));
                     Map<String, Object> source = JSONUtil.toBean(datasetTempStorage.getSource(), Map.class);
-                    String relativePath = ci4sUsername + "/datasets/" + source.get("repo_id") + "/" + source.get("identifier") + "/" + source.get("version") + "/dataset";
-                    newDatasetService.deleteDatasetVersionNew(Integer.valueOf((String) source.get("repo_id")), (String) source.get("identifier"), (String) source.get("owner"), (String) source.get("version"), relativePath);
+                    String relativePath = ci4sUsername + "/datasets/" + datasetTempStorage.getRepoId() + "/" + datasetTempStorage.getName() + "/" + datasetTempStorage.getVersion() + "/dataset";
+                    // todo owner替换为datasetTempStorage的
+                    newDatasetService.deleteDatasetVersionNew(datasetTempStorage.getRepoId(), datasetTempStorage.getName(), (String) source.get("owner"), datasetTempStorage.getVersion(), relativePath);
                 }
             }
         }

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

@@ -501,10 +501,11 @@ public class ExperimentServiceImpl implements ExperimentService {
                     if (datasets != null) {
                         for (Map<String, Object> dataset : datasets) {
                             DatasetTempStorage datasetTempStorage = new DatasetTempStorage();
+                            datasetTempStorage.setRepoId(Integer.valueOf((String) dataset.get("dataset_id")));
                             datasetTempStorage.setName((String) dataset.get("dataset_identifier"));
                             datasetTempStorage.setVersion((String) dataset.get("dataset_version"));
                             datasetTempStorage.setSource(JacksonUtil.toJSONString(sourceParams));
-                            datasetTempStorage.setState(1);
+                            datasetTempStorage.setState(Constant.State_valid);
                             datasetTempStorageService.insert(datasetTempStorage);
                         }
                     }

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetTempStorageDao.xml

@@ -140,8 +140,8 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into dataset_temp_storage(name, version, source, state, create_by, create_time, update_by, update_time)
-        values (#{name}, #{version}, #{source}, #{state}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime})
+        insert into dataset_temp_storage(repo_id, name, version, source, state, create_by, create_time, update_by, update_time)
+        values (#{repoId}, #{name}, #{version}, #{source}, #{state}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">