优化镜像名称及tag为已有数据，创建镜像和新增镜像版本成功bug

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/Constant.java

@@ -30,6 +30,8 @@ public class Constant {
     public final static String Source_Hand_Export = "hand_export";
     public final static String Source_Add = "add";
 
+    public final static String Building = "building";
+
     public final static String Running = "Running";
     public final static String Failed = "Failed";
     public final static String Pending = "Pending";

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java

@@ -92,7 +92,7 @@ public class ImageController extends BaseController {
     @PostMapping("/addImageAndVersion")
     @ApiOperation("添加镜像和版本")
     public GenericsAjaxResult<String> addImageAndVersion(@RequestBody ImageVo imageVo) throws Exception {
-        return genericsSuccess(this.imageService.insertImageAndVersion(imageVo));
+        return this.imageService.insertImageAndVersion(imageVo);
 
     }
 

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

@@ -1,5 +1,6 @@
 package com.ruoyi.platform.service;
 
+import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
 import com.ruoyi.platform.domain.Image;
 import com.ruoyi.platform.vo.ImageVo;
 import org.springframework.data.domain.Page;
@@ -75,7 +76,7 @@ public interface ImageService {
 
     String removeById(Integer id) throws Exception;
 
-    String insertImageAndVersion(ImageVo imageVo) throws Exception;
+    GenericsAjaxResult<String> insertImageAndVersion(ImageVo imageVo) throws Exception;
 
     /**
      * 本地上传构建镜像

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

@@ -2,6 +2,7 @@ package com.ruoyi.platform.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.util.DateUtils;
+import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.constant.Constant;
 import com.ruoyi.platform.domain.*;
@@ -227,7 +228,7 @@ public class ImageServiceImpl implements ImageService {
 
     @Override
     @Transactional
-    public String insertImageAndVersion(ImageVo imageVo) throws Exception {
+    public GenericsAjaxResult<String> insertImageAndVersion(ImageVo imageVo) throws Exception {
         Image existingImage = getByName(imageVo.getName());
         Image imageToUse;
         if (existingImage == null) {
@@ -243,6 +244,13 @@ public class ImageServiceImpl implements ImageService {
         } else {
             // 如果已存在相同名称的镜像，使用已存在的镜像
             imageToUse = existingImage;
+            ImageVersion query = new ImageVersion();
+            query.setImageId(imageToUse.getId());
+            query.setTagName(imageVo.getTagName());
+            long count = imageVersionDao.count(query);
+            if (count != 0) {
+                return GenericsAjaxResult.error("镜像版本已存在");
+            }
         }
         ImageVersion imageVersion = new ImageVersion();
         imageVersion.setImageId(imageToUse.getId());
@@ -250,7 +258,7 @@ public class ImageServiceImpl implements ImageService {
         imageVersion.setTagName(imageVo.getTagName());
         imageVersion.setFileSize(imageVo.getFileSize());
         imageVersion.setDescription(imageVo.getDescription());
-        imageVersion.setStatus("building");
+        imageVersion.setStatus(Constant.Building);
         ImageVersion imageVersionInsert = this.imageVersionService.insert(imageVersion);
         if (imageVersionInsert == null) {
             throw new Exception("新增镜像版本失败");
@@ -286,8 +294,7 @@ public class ImageServiceImpl implements ImageService {
             return null;
         });
 
-
-        return "新增镜像成功,镜像构建中...";
+        return GenericsAjaxResult.success("新增镜像成功,镜像构建中...");
     }
 
     @Override