From ff1d671e54d01014fd278b1c3a5108f9a98c32e7 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Mon, 13 Jan 2025 16:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=88=E6=AD=A2=E5=AE=9E?= =?UTF-8?q?=E9=AA=8Cbug=EF=BC=8C=E6=B5=81=E6=B0=B4=E7=BA=BF=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExperimentInsServiceImpl.java | 2 +- .../service/impl/ExperimentServiceImpl.java | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index fb65772b..03599dd1 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -450,7 +450,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { HashMap queryMap = new HashMap(); queryMap.put("ins_id", experimentIns.getId()); DatasetTempStorage datasetTempStorage = datasetTempStorageDao.queryByInsId(JSON.toJSONString(queryMap)); - String relativePath = datasetTempStorage.getCreateBy() + "/datasets/" + datasetTempStorage.getRepoId() + "/" + datasetTempStorage.getName() + "/" + datasetTempStorage.getVersion() + "/dataset"; + String relativePath = ci4sUsername + "/datasets/" + datasetTempStorage.getRepoId() + "/" + datasetTempStorage.getName() + "/" + datasetTempStorage.getVersion() + "/dataset"; newDatasetService.deleteDatasetVersionNew(datasetTempStorage.getRepoId(), datasetTempStorage.getName(), datasetTempStorage.getCreateBy(), datasetTempStorage.getVersion(), relativePath); } } 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 7be74ede..1a8fc568 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 @@ -581,13 +581,15 @@ public class ExperimentServiceImpl implements ExperimentService { if (trainDatasetList != null) { List trainDatasets = new ArrayList<>(); for (Map dataset : trainDatasetList) { - NewDatasetVo newDatasetVo = new NewDatasetVo(); - newDatasetVo.setId(Integer.valueOf((String) dataset.get("dataset_id"))); - newDatasetVo.setName((String) dataset.get("dataset_name")); - newDatasetVo.setVersion((String) dataset.get("dataset_version")); - newDatasetVo.setIdentifier((String) dataset.get("dataset_identifier")); - newDatasetVo.setOwner((String) dataset.get("owner")); - trainDatasets.add(newDatasetVo); + if(!dataset.containsKey("dataset_ref")) { + NewDatasetVo newDatasetVo = new NewDatasetVo(); + newDatasetVo.setId(Integer.valueOf((String) dataset.get("dataset_id"))); + newDatasetVo.setName((String) dataset.get("dataset_name")); + newDatasetVo.setVersion((String) dataset.get("dataset_version")); + newDatasetVo.setIdentifier((String) dataset.get("dataset_identifier")); + newDatasetVo.setOwner((String) dataset.get("owner")); + trainDatasets.add(newDatasetVo); + } } modelMetaVo.setTrainDatasets(trainDatasets); }