Merge pull request '611' (#57) from dev into master

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java

@@ -0,0 +1,39 @@
+package com.ruoyi.platform.controller.aim;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
+import com.ruoyi.platform.service.AimService;
+import com.ruoyi.platform.service.TensorBoardService;
+import com.ruoyi.platform.vo.FrameLogPathVo;
+import com.ruoyi.platform.vo.TensorboardStatusVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+@RestController
+@RequestMapping("aim")
+@Api("Aim管理")
+public class AimController extends BaseController {
+
+    @Resource
+    private AimService aimService;
+
+    /**
+     * 启动tensorBoard接口
+     *
+     * @param frameLogPathVo 存储路径
+     * @return url
+     */
+    @PostMapping("/run")
+    @ApiOperation("启动aim`")
+    @ApiResponse
+    public GenericsAjaxResult<String> runAim(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception {
+        return  genericsSuccess(aimService.runAim(frameLogPathVo));
+    }
+
+}

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
 import com.ruoyi.platform.service.JupyterService;
 import com.ruoyi.platform.vo.FrameLogPathVo;
+import com.ruoyi.platform.vo.PodStatusVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -56,6 +57,13 @@ public class JupyterController extends BaseController {
         return genericsSuccess(this.jupyterService.stopJupyterService(id));
     }
 
+    @PostMapping("/getStatus")
+    @ApiOperation("查询jupyter pod状态")
+    @ApiResponse
+    public GenericsAjaxResult<PodStatusVo> getStatus(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception {
+        return  genericsSuccess(this.jupyterService.getJupyterStatus(frameLogPathVo));
+    }
+
 
     @GetMapping(value = "/upload")
     public AjaxResult upload() throws Exception {

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/tensorBoard/TensorBoardController.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
 import com.ruoyi.platform.service.TensorBoardService;
 import com.ruoyi.platform.vo.FrameLogPathVo;
-import com.ruoyi.platform.vo.TensorboardStatusVo;
+import com.ruoyi.platform.vo.PodStatusVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -37,7 +37,7 @@ public class TensorBoardController extends BaseController {
     }
     @PostMapping("/getStatus")
     @ApiResponse
-    public GenericsAjaxResult<TensorboardStatusVo> getStatus(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception {
+    public GenericsAjaxResult<PodStatusVo> getStatus(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception {
         return  genericsSuccess(tensorBoardService.getTensorBoardStatus(frameLogPathVo));
     }
 }

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

@@ -0,0 +1,7 @@
+package com.ruoyi.platform.service;
+
+import com.ruoyi.platform.vo.FrameLogPathVo;
+
+public interface AimService {
+    String runAim(FrameLogPathVo frameLogPathVo);
+}

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

@@ -1,6 +1,7 @@
 package com.ruoyi.platform.service;
 
 import com.ruoyi.platform.vo.FrameLogPathVo;
+import com.ruoyi.platform.vo.PodStatusVo;
 
 import java.io.InputStream;
 
@@ -14,4 +15,6 @@ public interface JupyterService {
     String runJupyterService(Integer id);
 
     String stopJupyterService(Integer id) throws Exception;
+
+    PodStatusVo getJupyterStatus(FrameLogPathVo frameLogPathVo);
 }

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

@@ -1,12 +1,12 @@
 package com.ruoyi.platform.service;
 
 import com.ruoyi.platform.vo.FrameLogPathVo;
-import com.ruoyi.platform.vo.TensorboardStatusVo;
+import com.ruoyi.platform.vo.PodStatusVo;
 
 public interface TensorBoardService {
 
 
-    TensorboardStatusVo getTensorBoardStatus(FrameLogPathVo frameLogPathVo);
+    PodStatusVo getTensorBoardStatus(FrameLogPathVo frameLogPathVo);
     /**
      * 在集群中启动TensorBoard容器，并且返回地址，4小时后销毁
      * @param frameLogPathVo

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

@@ -0,0 +1,13 @@
+package com.ruoyi.platform.service.impl;
+
+import com.ruoyi.platform.service.AimService;
+import com.ruoyi.platform.vo.FrameLogPathVo;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AimServiceImpl implements AimService {
+    @Override
+    public String runAim(FrameLogPathVo frameLogPathVo) {
+        return null;
+    }
+}

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

@@ -30,10 +30,6 @@ public class DevEnvironmentServiceImpl implements DevEnvironmentService {
     private DevEnvironmentDao devEnvironmentDao;
 
 
-    @Resource
-    private JupyterService jupyterService;
-
-
     /**
      * 通过ID查询单条数据
      *

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

@@ -10,9 +10,13 @@ import com.ruoyi.platform.utils.JacksonUtil;
 import com.ruoyi.platform.utils.K8sClientUtil;
 import com.ruoyi.platform.utils.MinioUtil;
 import com.ruoyi.platform.utils.MlflowUtil;
+import com.ruoyi.platform.vo.FrameLogPathVo;
+import com.ruoyi.platform.vo.PodStatusVo;
 import com.ruoyi.system.api.model.LoginUser;
 import io.kubernetes.client.openapi.models.V1PersistentVolumeClaim;
+import io.kubernetes.client.openapi.models.V1Pod;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -49,6 +53,7 @@ public class JupyterServiceImpl implements JupyterService {
     private DevEnvironmentDao devEnvironmentDao;
 
     @Resource
+    @Lazy
     private DevEnvironmentService devEnvironmentService;
 
     @Resource
@@ -71,6 +76,9 @@ public class JupyterServiceImpl implements JupyterService {
     @Override
     public String runJupyterService(Integer id) {
         DevEnvironment devEnvironment = this.devEnvironmentDao.queryById(id);
+        if(devEnvironment == null){
+
+        }
         String envName = devEnvironment.getName();
         //TODO 设置环境变量
 
@@ -103,18 +111,22 @@ public class JupyterServiceImpl implements JupyterService {
 
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String podName = loginUser.getUsername().toLowerCase() + "-editor-pod";
-
+        //得到pod
+        V1Pod pod = k8sClientUtil.getNSPodList(namespace, podName);
+        if(pod == null){
+            return "pod不存在！";
+        }
         // 使用 Kubernetes API 删除 Pod
         String deleteResult = k8sClientUtil.deletePod(podName, namespace);
 
-        // 检查 Pod 是否存在
-        boolean exists = k8sClientUtil.checkPodExists(podName, namespace);
-        if (exists) {
-            throw new Exception("Pod " + podName + " 删除失败");
-        }
         return deleteResult + "，编辑器已停止";
     }
 
+    @Override
+    public PodStatusVo getJupyterStatus(FrameLogPathVo frameLogPathVo) {
+        return null;
+    }
+
 
     @Override
     public void upload(InputStream inputStream) {
@@ -136,4 +148,5 @@ public class JupyterServiceImpl implements JupyterService {
 
 
 
+
 }

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

@@ -180,6 +180,8 @@ public class ModelDependencyServiceImpl implements ModelDependencyService {
         modelVersionDependcyVo.setFileName(modelsVersion.getFileName());
         modelVersionDependcyVo.setFileSize(modelsVersion.getFileSize());
         modelVersionDependcyVo.setUrl(modelsVersion.getUrl());
+        modelVersionDependcyVo.setCreateBy(modelsVersion.getCreateBy());
+        modelVersionDependcyVo.setCreateTime(modelsVersion.getCreateTime());
         modelDependcyTreeVo.setWorkflowId(experiment.getWorkflowId());
         modelDependcyTreeVo.setModelVersionDependcyVo(modelVersionDependcyVo);
  

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

@@ -7,7 +7,7 @@ import com.ruoyi.platform.domain.PodStatus;
 import com.ruoyi.platform.service.TensorBoardService;
 import com.ruoyi.platform.utils.K8sClientUtil;
 import com.ruoyi.platform.vo.FrameLogPathVo;
-import com.ruoyi.platform.vo.TensorboardStatusVo;
+import com.ruoyi.platform.vo.PodStatusVo;
 import com.ruoyi.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -29,9 +29,9 @@ public class TensorBoardServiceImpl implements TensorBoardService {
     @Resource
     private K8sClientUtil k8sClientUtil;
     @Override
-    public TensorboardStatusVo getTensorBoardStatus(FrameLogPathVo frameLogPathVo){
+    public PodStatusVo getTensorBoardStatus(FrameLogPathVo frameLogPathVo){
         String status = PodStatus.Terminated.getName();
-        TensorboardStatusVo tensorboardStatusVo = new TensorboardStatusVo();
+        PodStatusVo tensorboardStatusVo = new PodStatusVo();
         tensorboardStatusVo.setStatus(status);
         if (StringUtils.isEmpty(frameLogPathVo.getPath())){
             return tensorboardStatusVo;

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JacksonUtil.java

@@ -218,6 +218,7 @@ public class JacksonUtil {
      */
     public static <T> List<T> parseJSONStr2TList(String jsonStr, Class<T> clazz, String dateFormat) {
         try {
+            if (StringUtils.isEmpty(jsonStr)) {  return new ArrayList<T>(); }
             ObjectMapper objectMapper = getObjectMapper(dateFormat, false, false, true);
             CollectionType listType = objectMapper.getTypeFactory().constructCollectionType(ArrayList.class, clazz);
             return objectMapper.readValue(jsonStr, listType);

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java

@@ -569,12 +569,8 @@ public class K8sClientUtil {
             V1Pod pod = api.deleteNamespacedPod(podName, namespace, null, null, null, null, null, null);
             return "Pod " + podName + " 删除请求已发送";
         } catch (ApiException e) {
-            if (e.getCode() == 404) {
-                return "Pod " + podName + " 不存在";
-            } else {
-                log.error("删除pod异常:" + e.getResponseBody(), e);
-                throw e;
-            }
+            log.error("删除pod异常:" + e.getResponseBody(), e);
+            throw e;
         }
     }
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelVersionDependcyVo.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
@@ -45,4 +46,10 @@ public class ModelVersionDependcyVo implements Serializable {
     @ApiModelProperty(value = "文件大小")
     private String fileSize;
 
+    @ApiModelProperty(value = "创建者")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
 }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/TensorboardStatusVo.java → ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/PodStatusVo.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import java.io.Serializable;
 
 @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
-public class TensorboardStatusVo implements Serializable {
+public class PodStatusVo implements Serializable {
     private String status;
     private String url;
 
@@ -25,4 +25,5 @@ public class TensorboardStatusVo implements Serializable {
     public void setUrl(String url) {
         this.url = url;
     }
+
 }

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml

@@ -26,7 +26,7 @@
         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
         from dev_environment
-        where id = #{id}
+        where id = #{id} and state = 1
     </select>
 
     <!--查询指定行数据-->
@@ -35,6 +35,7 @@
         id,name,status,computing_resource,standard,env_variable,image,dataset,model,alt_field1,alt_field2,create_by,create_time,update_by,update_time,state
         from dev_environment
         <where>
+            state = 1
             <if test="devEnvironment.id != null">
                 and id = #{devEnvironment.id}
             </if>
@@ -93,6 +94,7 @@
         select count(1)
         from dev_environment
         <where>
+            state = 1
             <if test="devEnvironment.id != null">
                 and id = #{devEnvironment.id}
             </if>