From e84beac4c62b5eb92b768ebb0a12bcbf4932e414 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, 7 Jun 2024 11:39:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=A8=A1=E5=9E=8B=E5=8F=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=80=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/service/impl/JupyterServiceImpl.java | 12 ++++++------ .../java/com/ruoyi/platform/utils/K8sClientUtil.java | 8 ++------ 2 files changed, 8 insertions(+), 12 deletions(-) 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 01a4153..e7fcf85 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 @@ -12,6 +12,7 @@ import com.ruoyi.platform.utils.MinioUtil; import com.ruoyi.platform.utils.MlflowUtil; 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.stereotype.Service; @@ -103,15 +104,14 @@ 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 + "，编辑器已停止"; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java index 9a5a2ab..febb449 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java @@ -573,12 +573,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; } } From 1bcdda2866045f19be500f84a3daf4de42c96b69 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Tue, 11 Jun 2024 08:47:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=BC=94=E5=8C=96?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/service/impl/ModelDependencyServiceImpl.java | 2 ++ .../java/com/ruoyi/platform/vo/ModelVersionDependcyVo.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java index 91b071c..da002c9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java +++ b/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); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelVersionDependcyVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelVersionDependcyVo.java index 9d835a4..7c9cec3 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelVersionDependcyVo.java +++ b/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; + } From b0fcc9200abaaff9ca1b679917403b1a7334866c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Tue, 11 Jun 2024 09:43:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/service/impl/JupyterServiceImpl.java | 4 ++++ .../mapper/managementPlatform/DevEnvironmentDaoMapper.xml | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 e7fcf85..5c9a55f 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 @@ -72,6 +72,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 设置环境变量 @@ -136,4 +139,5 @@ public class JupyterServiceImpl implements JupyterService { + } 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 432e9db..771d381 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 @@ -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 @@ -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 + state = 1 and id = #{devEnvironment.id} @@ -93,6 +94,7 @@ select count(1) from dev_environment + state = 1 and id = #{devEnvironment.id} From 877dd0ac3ee19a0c75c4d32bc0a0d81f58bebe10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Tue, 11 Jun 2024 16:12:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E4=BE=9D=E8=B5=96bug,=E6=B7=BB=E5=8A=A0=E6=87=92=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/jupyter/JupyterController.java | 8 ++++++++ .../controller/tensorBoard/TensorBoardController.java | 4 ++-- .../java/com/ruoyi/platform/service/JupyterService.java | 3 +++ .../com/ruoyi/platform/service/TensorBoardService.java | 4 ++-- .../ruoyi/platform/service/impl/JupyterServiceImpl.java | 9 +++++++++ .../platform/service/impl/TensorBoardServiceImpl.java | 6 +++--- .../vo/{TensorboardStatusVo.java => PodStatusVo.java} | 3 ++- 7 files changed, 29 insertions(+), 8 deletions(-) rename ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/{TensorboardStatusVo.java => PodStatusVo.java} (90%) 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 19a3476..0abcae7 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 @@ -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 getStatus(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception { + return genericsSuccess(this.jupyterService.getJupyterStatus(frameLogPathVo)); + } + @GetMapping(value = "/upload") public AjaxResult upload() throws Exception { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/tensorBoard/TensorBoardController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/tensorBoard/TensorBoardController.java index 4189454..53c4cc9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/tensorBoard/TensorBoardController.java +++ b/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 getStatus(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception { + public GenericsAjaxResult getStatus(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception { return genericsSuccess(tensorBoardService.getTensorBoardStatus(frameLogPathVo)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/JupyterService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/JupyterService.java index af62a50..f1aeb2c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/JupyterService.java +++ b/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); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/TensorBoardService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/TensorBoardService.java index 564b8de..3b431f2 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/TensorBoardService.java +++ b/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 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 5c9a55f..152af37 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 @@ -10,10 +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; @@ -50,6 +53,7 @@ public class JupyterServiceImpl implements JupyterService { private DevEnvironmentDao devEnvironmentDao; @Resource + @Lazy private DevEnvironmentService devEnvironmentService; @Resource @@ -118,6 +122,11 @@ public class JupyterServiceImpl implements JupyterService { return deleteResult + "，编辑器已停止"; } + @Override + public PodStatusVo getJupyterStatus(FrameLogPathVo frameLogPathVo) { + return null; + } + @Override public void upload(InputStream inputStream) { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/TensorBoardServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/TensorBoardServiceImpl.java index 0ce427a..2209773 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/TensorBoardServiceImpl.java +++ b/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; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/TensorboardStatusVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/PodStatusVo.java similarity index 90% rename from ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/TensorboardStatusVo.java rename to ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/PodStatusVo.java index a1104e8..0a8c8c0 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/TensorboardStatusVo.java +++ b/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; } + } From d8e3e98a95d8c5181c6a6f5ef1a43f6c124472ed Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Tue, 11 Jun 2024 16:16:45 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=BC=94=E5=8C=96?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/aim/AimController.java | 39 +++++++++++++++++++ .../ruoyi/platform/service/AimService.java | 7 ++++ .../platform/service/impl/AimServiceImpl.java | 13 +++++++ .../com/ruoyi/platform/utils/JacksonUtil.java | 1 + 4 files changed, 60 insertions(+) create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java new file mode 100644 index 0000000..ae28df8 --- /dev/null +++ b/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 runAim(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception { + return genericsSuccess(aimService.runAim(frameLogPathVo)); + } + +} \ No newline at end of file diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java new file mode 100644 index 0000000..60f74b9 --- /dev/null +++ b/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); +} diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java new file mode 100644 index 0000000..f66dc17 --- /dev/null +++ b/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; + } +} diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JacksonUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JacksonUtil.java index 6fd5938..aee2f0d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JacksonUtil.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JacksonUtil.java @@ -218,6 +218,7 @@ public class JacksonUtil { */ public static List parseJSONStr2TList(String jsonStr, Class clazz, String dateFormat) { try { + if (StringUtils.isEmpty(jsonStr)) { return new ArrayList(); } ObjectMapper objectMapper = getObjectMapper(dateFormat, false, false, true); CollectionType listType = objectMapper.getTypeFactory().constructCollectionType(ArrayList.class, clazz); return objectMapper.readValue(jsonStr, listType); From 9b41b66d7d3110dcab1566d318dc70b0c17f0ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Tue, 11 Jun 2024 16:18:36 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E4=BE=9D=E8=B5=96bug,=E6=B7=BB=E5=8A=A0=E6=87=92=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/service/impl/DevEnvironmentServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java index d5afec8..8f211a5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java +++ b/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查询单条数据 *