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 1/2] =?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 91b071ca..da002c9a 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 9d835a41..7c9cec3f 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 d8e3e98a95d8c5181c6a6f5ef1a43f6c124472ed Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Tue, 11 Jun 2024 16:16:45 +0800 Subject: [PATCH 2/2] =?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 00000000..ae28df8b --- /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 00000000..60f74b90 --- /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 00000000..f66dc178 --- /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 6fd59389..aee2f0d1 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);