diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java index 3167e2ec..080698c9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java @@ -4,9 +4,12 @@ import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.platform.domain.DevEnvironment; +import com.ruoyi.platform.service.DatasetService; import com.ruoyi.platform.service.JupyterService; +import com.ruoyi.platform.vo.DatasetVo; import com.ruoyi.platform.vo.FrameLogPathVo; import com.ruoyi.platform.vo.PodStatusVo; +import com.ruoyi.platform.vo.VersionVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -17,6 +20,8 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; @RestController @RequestMapping("/jupyter") @@ -24,6 +29,8 @@ import java.io.InputStream; public class JupyterController extends BaseController { @Resource private JupyterService jupyterService; + @Resource + private DatasetService datasetService; @GetMapping(value = "/getURL") @ApiOperation("得到访问地址") public GenericsAjaxResult getURL() throws IOException { @@ -79,4 +86,22 @@ public class JupyterController extends BaseController { jupyterService.mlflow(); return AjaxResult.success(); } + + @GetMapping(value = "/testdvc") + public AjaxResult testdvc() throws Exception { + DatasetVo datasetVo = new DatasetVo(); + datasetVo.setName("testdvc82sas155"); + datasetVo.setDescription("sss"); + datasetVo.setAvailableRange(0); + datasetVo.setDataTag("计算机视觉"); + datasetVo.setDataType("机器翻译"); + datasetVo.setVersion("dev"); + List datasetVersionVos = new ArrayList<>(); + VersionVo versionVo = new VersionVo(); + versionVo.setUrl("/home/xxx.txt"); + datasetVersionVos.add(versionVo); + datasetVo.setDatasetVersionVos(datasetVersionVos); + datasetService.newCreateDataset(datasetVo); + return AjaxResult.success(); + } } 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 be55468a..aa59b6ae 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 @@ -100,7 +100,7 @@ public class JupyterServiceImpl implements JupyterService { //TODO 设置镜像可配置,这里先用默认镜像启动pod // 调用修改后的 createPod 方法,传入额外的参数 - Integer podPort = k8sClientUtil.createConfiguredPod(podName, namespace, port, mountPath, pvc, image, minioPvcName, datasetPath, modelPath); + Integer podPort = k8sClientUtil.createConfiguredPod(podName, namespace, port, mountPath, pvc, devEnvironment.getImage(), minioPvcName, datasetPath, modelPath); String url = masterIp + ":" + podPort; redisService.setCacheObject(podName,masterIp + ":" + podPort); devEnvironment.setStatus("Pending");