From 07cb8890734ef14ef75ac1cf22d6bdb3d5d4f3c3 Mon Sep 17 00:00:00 2001
From: fanshuai <1141904845@qq.com>
Date: Thu, 14 Mar 2024 15:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=86=99=E4=B8=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/platform/domain/DatasetVersion.java   | 1 -
 .../com/ruoyi/platform/service/impl/DatasetServiceImpl.java   | 2 +-
 .../platform/service/impl/DatasetVersionServiceImpl.java      | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java
index 705992fa..9d987013 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java
@@ -28,7 +28,6 @@ public class DatasetVersion implements Serializable {
      * 版本
      */
     @ApiModelProperty(name = "version")
-    //@CheckDuplicate
     private String version;
     /**
      * 数据集存储地址
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 79c049ec..1fdc6d56 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
@@ -358,7 +358,7 @@ public class DatasetServiceImpl implements DatasetService {
             for (Field field : fields) {
                 if (field.isAnnotationPresent(CheckDuplicate.class)) {
                     CheckDuplicate annotation = field.getAnnotation(CheckDuplicate.class);
-                    throw new Exception(field.getName()+ "不能重复");
+                    throw new Exception(field.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 44c5356e..fcf15068 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
@@ -160,7 +160,7 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
             for (Field field : fields) {
                 if (field.isAnnotationPresent(CheckDuplicate.class)) {
                     CheckDuplicate annotation = field.getAnnotation(CheckDuplicate.class);
-                    throw new Exception(annotation.value() + "数据集版本不能重复");
+                    throw new Exception(field.getName() + annotation.message());
                 }
             }
         }
@@ -183,7 +183,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());