commit

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

@@ -319,7 +319,12 @@ public class TaskDomainService {
             sceneRiskEvaluationComputeParam.setCreateUserId(null);
             sceneRiskEvaluationComputeParam.setTaskId(projectId);
             sceneRiskEvaluationComputeParam.setComputeType(DictConstants.RISK);
-            sceneRiskEvaluationComputeParam.setVehicleId(projectEntity.getVehicle());
+            if (projectEntity.getVehicleArray() != null) {
+                String[] vehicles = projectEntity.getVehicleArray().split(",");
+                if (vehicles.length >= 2) {
+                    sceneRiskEvaluationComputeParam.setVehicleId(vehicles[1]);
+                }
+            }
             sceneRiskEvaluationComputeParam.setAlgorithmId(projectEntity.getAlgorithm());
             computeSceneEvaluation(sceneRiskEvaluationComputeParam);
         }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SimulationManualProjectMapper.java

@@ -20,6 +20,7 @@ public interface SimulationManualProjectMapper {
             @Result(column = "now_run_state", property = "nowRunState", jdbcType = JdbcType.VARCHAR),
             @Result(column = "project_type", property = "projectType", jdbcType = JdbcType.VARCHAR),
             @Result(column = "is_choice_gpu", property = "isChoiceGpu", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "vehicle_array", property = "vehicleArray", jdbcType = JdbcType.VARCHAR),
             @Result(column = "complexity_evaluation_rule_id", property = "complexityEvaluationRuleId", jdbcType = JdbcType.VARCHAR),
             @Result(column = "risk_evaluation_rule_id", property = "riskEvaluationRuleId", jdbcType = JdbcType.VARCHAR),
             @Result(column = "max_simulation_time", property = "maxSimulationTime", jdbcType = JdbcType.VARCHAR)
@@ -32,6 +33,7 @@ public interface SimulationManualProjectMapper {
             "       is_choice_gpu,\n" +
             "       algorithm,\n" +
             "       vehicle,\n" +
+            "       vehicle_array,\n" +
             "       risk_evaluation_rule_id,\n" +
             "       complexity_evaluation_rule_id,\n" +
             "       '1' project_type,\n" +

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ProjectEntity.java

@@ -22,4 +22,5 @@ public class ProjectEntity {
     private String vehicle;
     private String complexityEvaluationRuleId;
     private String riskEvaluationRuleId;
+    private String vehicleArray;
 }