From e6530ea9a572e52462a9a5cf592d725d2658eb16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com>
Date: Fri, 21 Jun 2024 15:38:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:jupyter=E8=BF=94=E5=9B=9E=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/platform/domain/DevEnvironment.java | 10 +++---
 .../service/impl/JupyterServiceImpl.java      |  5 ++-
 .../DevEnvironmentDaoMapper.xml               | 32 +++++++++----------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DevEnvironment.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DevEnvironment.java
index 75d5ad8b..cb4ebf3c 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DevEnvironment.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DevEnvironment.java
@@ -54,7 +54,7 @@ public class DevEnvironment implements Serializable {
 /**
      * 备用字段1
      */
-    private String altField1;
+    private String url;
 /**
      * 备用字段2
      */
@@ -153,12 +153,12 @@ public class DevEnvironment implements Serializable {
         this.model = model;
     }
 
-    public String getAltField1() {
-        return altField1;
+    public String getUrl() {
+        return url;
     }
 
-    public void setAltField1(String altField1) {
-        this.altField1 = altField1;
+    public void setUrl(String url) {
+        this.url = url;
     }
 
     public String getAltField2() {
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java
index fcdea60f..46071e7e 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java
@@ -105,9 +105,11 @@ public class JupyterServiceImpl implements JupyterService {
         Thread.sleep(2500);
         //查询pod状态，更新到数据库
         String podStatus = k8sClientUtil.getPodStatus(podName, namespace);
+        String url = masterIp + ":" + podPort;
         devEnvironment.setStatus(podStatus);
+        devEnvironment.setUrl(url);
         this.devEnvironmentService.update(devEnvironment);
-        return masterIp + ":" + podPort;
+        return url ;
 
 
     }
@@ -129,6 +131,7 @@ public class JupyterServiceImpl implements JupyterService {
         // 使用 Kubernetes API 删除 Pod
         String deleteResult = k8sClientUtil.deletePod(podName, namespace);
 
+
         devEnvironment.setStatus("Terminating");
         this.devEnvironmentService.update(devEnvironment);
         return deleteResult + "，编辑器已停止";
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml
index 771d3819..cfab27a7 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml
@@ -12,7 +12,7 @@
         <result property="image" column="image" jdbcType="VARCHAR"/>
         <result property="dataset" column="dataset" jdbcType="VARCHAR"/>
         <result property="model" column="model" jdbcType="VARCHAR"/>
-        <result property="altField1" column="alt_field1" jdbcType="VARCHAR"/>
+        <result property="url" column="url" jdbcType="VARCHAR"/>
         <result property="altField2" column="alt_field2" jdbcType="VARCHAR"/>
         <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -24,7 +24,7 @@
     <!--查询单个-->
     <select id="queryById" resultMap="DevEnvironmentMap">
         select
-        id,name,status,computing_resource,standard,env_variable,image,dataset,model,alt_field1,alt_field2,create_by,create_time,update_by,update_time,state
+        id,name,status,computing_resource,standard,env_variable,image,dataset,model,url,alt_field2,create_by,create_time,update_by,update_time,state
         from dev_environment
         where id = #{id} and state = 1
     </select>
@@ -32,7 +32,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="DevEnvironmentMap">
         select
-        id,name,status,computing_resource,standard,env_variable,image,dataset,model,alt_field1,alt_field2,create_by,create_time,update_by,update_time,state
+        id,name,status,computing_resource,standard,env_variable,image,dataset,model,url,alt_field2,create_by,create_time,update_by,update_time,state
         from dev_environment
         <where>
             state = 1
@@ -63,8 +63,8 @@
             <if test="devEnvironment.model != null and devEnvironment.model != ''">
                 and model = #{devEnvironment.model}
             </if>
-            <if test="devEnvironment.altField1 != null and devEnvironment.altField1 != ''">
-                and alt_field1 = #{devEnvironment.altField1}
+            <if test="devEnvironment.url != null and devEnvironment.url != ''">
+                and url = #{devEnvironment.url}
             </if>
             <if test="devEnvironment.altField2 != null and devEnvironment.altField2 != ''">
                 and alt_field2 = #{devEnvironment.altField2}
@@ -122,8 +122,8 @@
             <if test="devEnvironment.model != null and devEnvironment.model != ''">
                 and model = #{devEnvironment.model}
             </if>
-            <if test="devEnvironment.altField1 != null and devEnvironment.altField1 != ''">
-                and alt_field1 = #{devEnvironment.altField1}
+            <if test="devEnvironment.url != null and devEnvironment.url != ''">
+                and url = #{devEnvironment.url}
             </if>
             <if test="devEnvironment.altField2 != null and devEnvironment.altField2 != ''">
                 and alt_field2 = #{devEnvironment.altField2}
@@ -148,7 +148,7 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into dev_environment(name,status,computing_resource,standard,env_variable,image,dataset,model,alt_field1,alt_field2,create_by,create_time,update_by,update_time,state)
+        insert into dev_environment(name,status,computing_resource,standard,env_variable,image,dataset,model,url,alt_field2,create_by,create_time,update_by,update_time,state)
         values (#{devEnvironment.name},
                 #{devEnvironment.status},
                 #{devEnvironment.computingResource},
@@ -157,7 +157,7 @@
                 #{devEnvironment.image},
                 #{devEnvironment.dataset},
                 #{devEnvironment.model},
-                #{devEnvironment.altField1},
+                #{devEnvironment.url},
                 #{devEnvironment.altField2},
                 #{devEnvironment.createBy},
                 #{devEnvironment.createTime},
@@ -168,21 +168,21 @@
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into dev_environment(name,status,computing_resource,standard,env_variable,image,dataset,model,alt_field1,alt_field2,create_by,create_time,update_by,update_time,state  )
+        insert into dev_environment(name,status,computing_resource,standard,env_variable,image,dataset,model,url,alt_field2,create_by,create_time,update_by,update_time,state  )
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.name},#{entity.status},#{entity.computingResource},#{entity.standard},#{entity.envVariable},#{entity.image},#{entity.dataset},#{entity.model},#{entity.altField1},#{entity.altField2},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state})
+        (#{entity.name},#{entity.status},#{entity.computingResource},#{entity.standard},#{entity.envVariable},#{entity.image},#{entity.dataset},#{entity.model},#{entity.url},#{entity.altField2},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into dev_environment(name,status,computing_resource,standard,env_variable,image,dataset,model,alt_field1,alt_field2,create_by,create_time,update_by,update_time,state)
+        insert into dev_environment(name,status,computing_resource,standard,env_variable,image,dataset,model,url,alt_field2,create_by,create_time,update_by,update_time,state)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.name}#{entity.status}#{entity.computingResource}#{entity.standard}#{entity.envVariable}#{entity.image}#{entity.dataset}#{entity.model}#{entity.altField1}#{entity.altField2}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime}#{entity.state})
+            (#{entity.name}#{entity.status}#{entity.computingResource}#{entity.standard}#{entity.envVariable}#{entity.image}#{entity.dataset}#{entity.model}#{entity.url}#{entity.altField2}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime}#{entity.state})
         </foreach>
         on duplicate key update
-name = values(name)status = values(status)computing_resource = values(computing_resource)standard = values(standard)env_variable = values(env_variable)image = values(image)dataset = values(dataset)model = values(model)alt_field1 = values(alt_field1)alt_field2 = values(alt_field2)create_by = values(create_by)create_time = values(create_time)update_by = values(update_by)update_time = values(update_time)state = values(state)
+name = values(name)status = values(status)computing_resource = values(computing_resource)standard = values(standard)env_variable = values(env_variable)image = values(image)dataset = values(dataset)model = values(model)url = values(url)alt_field2 = values(alt_field2)create_by = values(create_by)create_time = values(create_time)update_by = values(update_by)update_time = values(update_time)state = values(state)
     </insert>
 
     <!--通过主键修改数据-->
@@ -213,8 +213,8 @@ name = values(name)status = values(status)computing_resource = values(computing_
             <if test="devEnvironment.model != null and devEnvironment.model != ''">
                 model = #{devEnvironment.model},
             </if>
-            <if test="devEnvironment.altField1 != null and devEnvironment.altField1 != ''">
-                alt_field1 = #{devEnvironment.altField1},
+            <if test="devEnvironment.url != null and devEnvironment.url != ''">
+                url = #{devEnvironment.url},
             </if>
             <if test="devEnvironment.altField2 != null and devEnvironment.altField2 != ''">
                 alt_field2 = #{devEnvironment.altField2},