diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java index 3857c25e..6728f124 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java @@ -87,14 +87,13 @@ public class DatasetVersionController { * @param datasetVersions 实体 * @return 新增结果 */ - @PostMapping(("/addDatasetVersions")) + @PostMapping("/addDatasetVersions") @ApiOperation("添加数据集版本") public AjaxResult addDatasetVersions(@RequestBody List datasetVersions) throws Exception { return AjaxResult.success(this.datasetVersionService.addDatasetVersions(datasetVersions)); } - /** * 编辑数据 * diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java index 61b15758..803bf068 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java @@ -67,9 +67,6 @@ public class ModelsVersionController { } - - - /** * 新增数据 * @@ -84,11 +81,11 @@ public class ModelsVersionController { /** * 批量新增模型版本 * - * @param datasetVersions 实体 + * @param modelsVersions 实体 * @return 新增结果 */ - @PostMapping(("/addDatasetVersions")) - @ApiOperation("添加数据集版本") + @PostMapping("/addModelVersions") + @ApiOperation("添加模型版本") public AjaxResult addModelVersions(@RequestBody List modelsVersions) throws Exception { return AjaxResult.success(this.modelsVersionService.addModelVersions(modelsVersions)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java index b01ae0b1..edfa83bd 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java @@ -362,15 +362,28 @@ public class DatasetServiceImpl implements DatasetService { public void checkDeclaredName(Dataset insert) throws Exception { - Dataset dataset = datasetDao.findByName(insert.getName()); - if (dataset != null) { + Dataset existingDataset = datasetDao.findByName(insert.getName()); + if (existingDataset != null) { + // Check if the found dataset is not the same as the one being inserted + // This is important if you are using this method for both insert and update operations + // You may need an identifier check here, e.g., if 'insert' has an ID and it's the same as 'existingDataset' + if (insert.getId() != null && insert.getId().equals(existingDataset.getId())) { + // This is the same dataset, no duplicate name issue for update operation + return; + } + + // Now we know there's another dataset with the same name Field[] fields = Dataset.class.getDeclaredFields(); for (Field field : fields) { - if (field.isAnnotationPresent(CheckDuplicate.class)) { + field.setAccessible(true); // Make private fields accessible + + if ("name".equals(field.getName()) && field.isAnnotationPresent(CheckDuplicate.class)) { + // If the field is 'name' and is marked with CheckDuplicate annotation CheckDuplicate annotation = field.getAnnotation(CheckDuplicate.class); - throw new Exception(field.getName()+ annotation.message()); + throw new Exception("重复的数据集名称: " + insert.getName() + ". " + annotation.message()); } } } } + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java index 4d7a81d5..d4109884 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java @@ -181,7 +181,7 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { } private void insertPrepare(DatasetVersion datasetVersion) throws Exception { - checkDeclaredVersion(datasetVersion); + //checkDeclaredVersion(datasetVersion); LoginUser loginUser = SecurityUtils.getLoginUser(); datasetVersion.setCreateBy(loginUser.getUsername()); datasetVersion.setUpdateBy(loginUser.getUsername()); diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml index fe4a1fac..5964c7d8 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml @@ -171,7 +171,6 @@ state = 1 - and name like "%"#{workflow.name}"%"