diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/RayIns.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/RayIns.java index 3de2e1a9..54a41d08 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/RayIns.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/RayIns.java @@ -9,6 +9,7 @@ import lombok.Data; import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Map; @Data @@ -45,6 +46,9 @@ public class RayIns { private Date finishTime; + @TableField(exist = false) + private List fileList; + @TableField(exist = false) private ArrayList> trialList; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java index 3f852dc9..6b388c57 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java @@ -171,7 +171,9 @@ public class RayInsServiceImpl implements RayInsService { if (Constant.Running.equals(rayIns.getStatus()) || Constant.Pending.equals(rayIns.getStatus())) { rayIns = queryStatusFromArgo(rayIns); } - rayIns.setTrialList(getTrialList(rayIns.getResultPath())); + getTrialList(rayIns); + +// rayIns.setTrialList(getTrialList(rayIns.getResultPath())); return rayIns; } @@ -265,12 +267,14 @@ public class RayInsServiceImpl implements RayInsService { return rayInsDao.queryByRayInsIsNotTerminated(); } - public ArrayList> getTrialList(String directoryPath) throws Exception { + public void getTrialList(RayIns rayIns) throws Exception { // 获取指定路径下的所有文件 + String directoryPath = rayIns.getResultPath(); String prefix = directoryPath.substring(directoryPath.indexOf("/") + 1, directoryPath.length()) + "/"; List maps = minioUtil.listFilesInDirectory(bucketName, prefix); if (!maps.isEmpty()) { + rayIns.setFileList(maps); List collect = maps.stream().filter(map -> map.get("name").toString().startsWith("experiment_state")).collect(Collectors.toList()); if (!collect.isEmpty()) { Path experimentState = Paths.get(collect.get(0).get("name").toString()); @@ -298,9 +302,8 @@ public class RayInsServiceImpl implements RayInsService { trialList.add(trial); } - return trialList; + rayIns.setTrialList(trialList); } } - return null; } }