Browse Source

优化

pull/229/head
chenzhihang 8 months ago
parent
commit
d1928d702b
2 changed files with 5 additions and 5 deletions
  1. +4
    -4
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java
  2. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

+ 4
- 4
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java View File

@@ -328,11 +328,11 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
experimentIns.setNodesStatus(nodeStatusJson); experimentIns.setNodesStatus(nodeStatusJson);


//终止态为终止不改 //终止态为终止不改
if (!StringUtils.equals(experimentIns.getStatus(), "Terminated")) {
experimentIns.setStatus(StringUtils.isNotEmpty((String) status.get("phase")) ? (String) status.get("phase") : "Pending");
if (!StringUtils.equals(experimentIns.getStatus(), Constant.Terminated)) {
experimentIns.setStatus(StringUtils.isNotEmpty((String) status.get("phase")) ? (String) status.get("phase") : Constant.Pending);
} }
if (StringUtils.equals(experimentIns.getStatus(), Constant.Error)) { if (StringUtils.equals(experimentIns.getStatus(), Constant.Error)) {
experimentIns.setStatus("Failed");
experimentIns.setStatus(Constant.Failed);
} }


return experimentIns; return experimentIns;
@@ -661,7 +661,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
// 定义终止态的列表,例如 "Succeeded", "Failed" 等 // 定义终止态的列表,例如 "Succeeded", "Failed" 等
String status = ins.getStatus(); String status = ins.getStatus();
boolean flag = true; boolean flag = true;
List<String> terminatedStates = Arrays.asList("Succeeded", "Failed");
List<String> terminatedStates = Arrays.asList("Succeeded", Constant.Failed);
flag = terminatedStates.contains(status); flag = terminatedStates.contains(status);
if (StringUtils.equals(status, "Terminated")) { if (StringUtils.equals(status, "Terminated")) {
//如果跟node_status里面不一样,就要去更新node_status的信息 //如果跟node_status里面不一样,就要去更新node_status的信息


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java View File

@@ -595,7 +595,7 @@ public class ModelsServiceImpl implements ModelsService {
Map project = gitService.createProject(token, gitProjectVo); Map project = gitService.createProject(token, gitProjectVo);
Integer gitlinIid = (Integer) project.get("id"); Integer gitlinIid = (Integer) project.get("id");
if (gitlinIid == null) { if (gitlinIid == null) {
throw new Exception("创建模型失败:" + project.get("message"));
throw new RuntimeException("创建模型失败:" + project.get("message"));
} }


String branchName = modelsVo.getVersion(); String branchName = modelsVo.getVersion();


Loading…
Cancel
Save