commit

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/TaskDomainService.java

@@ -1,7 +1,6 @@
 package com.css.simulation.resource.scheduler.domain.service;
 
 import api.common.pojo.constants.DictConstants;
-import api.common.pojo.enums.SceneEvaluationEnum;
 import api.common.pojo.param.scene.SceneEvaluationComputeParam;
 import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.po.scene.SceneComplexityPO;
@@ -523,7 +522,12 @@ public class TaskDomainService {
             }
         }
         //        String sceneEvaluationCommand = "python3 " + pyMainPath + " " + (scenePath);
-        String sceneEvaluationCommand = "python " + pyMainPath + " -root_path  " + (scenePathFather);
+        String sceneEvaluationCommand;
+        if (StringUtils.equals(sceneEvaluationComputeParams.get(0).getComputeType(), DictConstants.COMPLEXITY)) {
+            sceneEvaluationCommand = "python " + pyMainPath + " complexity";
+        } else {
+            sceneEvaluationCommand = "python " + pyMainPath + " criticality";
+        }
         String sceneEvaluationResult;
         log.info("开始执行场景评价命令：" + sceneEvaluationCommand);
         Runtime r = Runtime.getRuntime();

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneEvaluationRuleService.java

@@ -302,7 +302,12 @@ public class SceneEvaluationRuleService {
             }
         }
 //        String sceneEvaluationCommand = "python3 " + pyMainPath + " " + (scenePath);
-        String sceneEvaluationCommand = "python " + pyMainPath + " -root_path  " + (scenePathFather);
+        String sceneEvaluationCommand;
+        if (StringUtils.equals(sceneEvaluationComputeParams.get(0).getComputeType(), DictConstants.COMPLEXITY)) {
+            sceneEvaluationCommand = "python " + pyMainPath + " complexity";
+        } else {
+            sceneEvaluationCommand = "python " + pyMainPath + " criticality";
+        }
         String sceneEvaluationResult;
         log.info("开始执行场景评价命令：" + sceneEvaluationCommand);
         Runtime r = Runtime.getRuntime();