From a73b83c97df107b79957c5b0a89e3341767f611e Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Wed, 28 Aug 2024 08:51:58 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=9D=E5=AD=98=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9A=84=E9=95=9C=E5=83=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/service/impl/ImageServiceImpl.java     | 13 +++++++++++--
 .../main/java/com/ruoyi/platform/vo/ImageVo.java    |  6 +++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
index 2c2de8c..52a370f 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
@@ -2,8 +2,10 @@ package com.ruoyi.platform.service.impl;
 
 import com.alibaba.fastjson2.util.DateUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.platform.domain.DevEnvironment;
 import com.ruoyi.platform.domain.Image;
 import com.ruoyi.platform.domain.ImageVersion;
+import com.ruoyi.platform.mapper.DevEnvironmentDao;
 import com.ruoyi.platform.mapper.ImageDao;
 import com.ruoyi.platform.mapper.ImageVersionDao;
 import com.ruoyi.platform.service.ImageService;
@@ -44,6 +46,8 @@ public class ImageServiceImpl implements ImageService {
     private ImageDao imageDao;
     @Resource
     private ImageVersionDao imageVersionDao;
+    @Resource
+    private DevEnvironmentDao devEnvironmentDao;
 
     @Resource
     private ImageVersionService imageVersionService;
@@ -357,7 +361,6 @@ public class ImageServiceImpl implements ImageService {
     }
 
     @Override
-    @Async
     @Transactional
     public String saveImage(ImageVo imageVo) {
         if(imageDao.getByName(imageVo.getName()) != null){
@@ -365,7 +368,7 @@ public class ImageServiceImpl implements ImageService {
         }
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String username = loginUser.getUsername().toLowerCase();
-        String podName = username +"-editor-pod" +  "-" + imageVo.getDevEnvironmentId();
+        String podName = username +"-editor-pod" +  "-" + imageVo.getDevEnvironmentId().toString();
 
         try {
             String containerId = k8sClientUtil.getPodContainerId(podName, namespace);
@@ -397,6 +400,12 @@ public class ImageServiceImpl implements ImageService {
             imageVersion.setStatus("available");
             imageVersionDao.insert(imageVersion);
 
+            //更新dev环境的镜像信息
+            DevEnvironment devEnvironment = new DevEnvironment();
+            devEnvironment.setId(imageVo.getDevEnvironmentId());
+            devEnvironment.setImage(resultMap.get("imageName"));
+            devEnvironmentDao.update(devEnvironment);
+
             return "保存镜像成功";
         } catch (Exception e) {
             throw new RuntimeException("保存镜像失败:" +e);
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java
index 1153b57..4dabab2 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java
@@ -65,7 +65,7 @@ public class ImageVo implements Serializable {
 
 
     @ApiModelProperty(value = "环境id")
-    private String devEnvironmentId;
+    private Integer devEnvironmentId;
 //    public Integer getId() {
 //        return id;
 //    }
@@ -154,11 +154,11 @@ public class ImageVo implements Serializable {
         this.path = path;
     }
 
-    public String getDevEnvironmentId() {
+    public Integer getDevEnvironmentId() {
         return devEnvironmentId;
     }
 
-    public void setDevEnvironmentId(String devEnvironmentId) {
+    public void setDevEnvironmentId(Integer devEnvironmentId) {
         this.devEnvironmentId = devEnvironmentId;
     }