Merge remote-tracking branch 'origin/dev' into dev

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/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/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/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/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/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;
+
 }