插入版本判重

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java

@@ -77,7 +77,7 @@ public class ModelsVersionController extends BaseController {
      * @return 新增结果
      */
     @PostMapping
-    public GenericsAjaxResult<ModelsVersion> add(@RequestBody ModelsVersion modelsVersion) {
+    public GenericsAjaxResult<ModelsVersion> add(@RequestBody ModelsVersion modelsVersion) throws Exception {
         return  genericsSuccess(this.modelsVersionService.insert(modelsVersion));
     }
 

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

@@ -27,6 +27,7 @@ public class DatasetVersion implements Serializable {
     private Integer datasetId;
 
     @ApiModelProperty(value = "版本")
+    @CheckDuplicate
     private String version;
 
     @ApiModelProperty(value = "数据集存储地址")

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

@@ -2,6 +2,7 @@ package com.ruoyi.platform.domain;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.ruoyi.platform.annotations.CheckDuplicate;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -28,6 +29,7 @@ private Integer id;
     private Integer modelsId;
 
     @ApiModelProperty(value = "版本")
+    @CheckDuplicate
     private String version;
 
     @ApiModelProperty(value = "模型存储地址")

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

@@ -72,5 +72,5 @@ public interface DatasetVersionService {
 
     void checkDeclaredVersion(DatasetVersion insert) throws Exception;
 
-    String addDatasetVersions(List<DatasetVersion> datasetVersions);
+    String addDatasetVersions(List<DatasetVersion> datasetVersions) throws Exception;
 }

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

@@ -40,7 +40,7 @@ public interface ModelsVersionService {
      * @param modelsVersion 实例对象
      * @return 实例对象
      */
-    ModelsVersion insert(ModelsVersion modelsVersion);
+    ModelsVersion insert(ModelsVersion modelsVersion) throws Exception;
 
     /**
      * 修改数据
@@ -62,7 +62,7 @@ public interface ModelsVersionService {
 
     List<ModelsVersion> queryByModelsId(Integer modelsId);
 
-    ModelsVersion duplicateModelsVersion(ModelsVersion oldModelsVersion);
+    ModelsVersion duplicateModelsVersion(ModelsVersion oldModelsVersion) throws Exception;
 
     ModelsVersion queryByModelsVersion(ModelsVersion modelsVersion);
 
@@ -70,5 +70,7 @@ public interface ModelsVersionService {
 
     Map<Integer, String> deleteModelsVersion(Integer modelsId, String version);
 
-    String addModelVersions(List<ModelsVersion> modelsVersions);
+    String addModelVersions(List<ModelsVersion> modelsVersions) throws Exception;
+
+    void checkDeclaredVersion(ModelsVersion insert) throws Exception;
 }

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

@@ -5,8 +5,6 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.annotations.CheckDuplicate;
 import com.ruoyi.platform.domain.Dataset;
 import com.ruoyi.platform.domain.DatasetVersion;
-import com.ruoyi.platform.domain.Models;
-import com.ruoyi.platform.domain.ModelsVersion;
 import com.ruoyi.platform.mapper.DatasetDao;
 import com.ruoyi.platform.mapper.DatasetVersionDao;
 import com.ruoyi.platform.service.DatasetService;
@@ -17,9 +15,7 @@ import com.ruoyi.platform.utils.MinioUtil;
 import com.ruoyi.platform.vo.DatasetVersionVo;
 import com.ruoyi.platform.vo.DatasetVo;
 import com.ruoyi.system.api.model.LoginUser;
-import io.minio.MinioClient;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -257,6 +253,7 @@ public class DatasetServiceImpl implements DatasetService {
 
     }
 
+
     @Override
     public Map uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception {
         String username = SecurityUtils.getLoginUser().getUsername();

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

@@ -164,7 +164,7 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
     }
 
     @Override
-    public String addDatasetVersions(List<DatasetVersion> datasetVersions) {
+    public String addDatasetVersions(List<DatasetVersion> datasetVersions) throws Exception {
         try {
             // 遍历传入的 datasetVersions 列表
             for(DatasetVersion datasetVersion : datasetVersions) {
@@ -174,14 +174,15 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
             return "新增数据集版本成功";
         } catch (Exception e) {
             // 如果出现异常，返回异常消息
-            return "新增数据集版本失败: " + e.getMessage();
+            throw new Exception("新增数据集版本失败: " + e.getMessage());
+
         }
 
 
     }
 
     private void insertPrepare(DatasetVersion datasetVersion) throws Exception {
-        //checkDeclaredVersion(datasetVersion);
+        checkDeclaredVersion(datasetVersion);
         LoginUser loginUser = SecurityUtils.getLoginUser();
         datasetVersion.setCreateBy(loginUser.getUsername());
         datasetVersion.setUpdateBy(loginUser.getUsername());

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

@@ -1,7 +1,7 @@
 package com.ruoyi.platform.service.impl;
 
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.platform.domain.DatasetVersion;
+import com.ruoyi.platform.annotations.CheckDuplicate;
 import com.ruoyi.platform.domain.ModelsVersion;
 import com.ruoyi.platform.mapper.ModelsDao;
 import com.ruoyi.platform.mapper.ModelsVersionDao;
@@ -14,6 +14,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -64,7 +65,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
      * @return 实例对象
      */
     @Override
-    public ModelsVersion insert(ModelsVersion modelsVersion) {
+    public ModelsVersion insert(ModelsVersion modelsVersion) throws Exception {
         //插入预备
         insertPrepare(modelsVersion);
         this.modelsVersionDao.insert(modelsVersion);
@@ -135,7 +136,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
      * @param oldModelsVersion 待更新的模型版本
      * @return 新的模型版本记录
      */
-    public ModelsVersion duplicateModelsVersion(ModelsVersion oldModelsVersion) {
+    public ModelsVersion duplicateModelsVersion(ModelsVersion oldModelsVersion) throws Exception {
         ModelsVersion newModelsVersion = new ModelsVersion();
         newModelsVersion.setModelsId(oldModelsVersion.getModelsId());
         newModelsVersion.setVersion(oldModelsVersion.getVersion());
@@ -177,7 +178,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
     }
 
     @Override
-    public String addModelVersions(List<ModelsVersion> modelsVersions) {
+    public String addModelVersions(List<ModelsVersion> modelsVersions) throws Exception {
         try {
             // 遍历传入的 datasetVersions 列表
             for(ModelsVersion modelsVersion : modelsVersions) {
@@ -187,11 +188,26 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
             return "新增模型版本成功";
         } catch (Exception e) {
             // 如果出现异常，返回异常消息
-            return "新增模型版本失败: " + e.getMessage();
+            throw new Exception("新增模型版本失败: " + e.getMessage()) ;
         }
     }
 
-    private void insertPrepare(ModelsVersion modelsVersion) {
+    @Override
+    public void checkDeclaredVersion(ModelsVersion insert) throws Exception {
+        ModelsVersion modelsVersion = modelsVersionDao.queryByModelsVersion(insert);
+        if (modelsVersion != null) {
+            Field[] fields = ModelsVersion.class.getDeclaredFields();
+            for (Field field : fields) {
+                if (field.isAnnotationPresent(CheckDuplicate.class)) {
+                    CheckDuplicate annotation = field.getAnnotation(CheckDuplicate.class);
+                    throw new Exception(field.getName() + annotation.message());
+                }
+            }
+        }
+    }
+
+    private void insertPrepare(ModelsVersion modelsVersion) throws Exception {
+        checkDeclaredVersion(modelsVersion);
         LoginUser loginUser = SecurityUtils.getLoginUser();
         modelsVersion.setCreateBy(loginUser.getUsername());
         modelsVersion.setUpdateBy(loginUser.getUsername());