commit

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

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

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

@@ -20,7 +20,6 @@ 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)
@@ -33,7 +32,6 @@ 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,5 +22,4 @@ public class ProjectEntity {
     private String vehicle;
     private String complexityEvaluationRuleId;
     private String riskEvaluationRuleId;
-    private String vehicleArray;
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneRiskMapper.java

@@ -18,7 +18,7 @@ public interface SceneRiskMapper {
 
     @Select("select sr.risk_id, sr.scene_id, sr.scene_type,sr.rule_id ,ser.rule_name, sr.task_id ,sr.risk, sr.risk_level, mv.vehicle_name, a.algorithm_name \n" +
             "from scene_risk sr LEFT JOIN scene_evaluation_rule ser  ON ser.rule_id = sr.rule_id \n" +
-            "LEFT JOIN algorithm a  ON sr.algorithm_id = a.id LEFT JOIN model_vehicle mv ON mv.id = sr.vehicle_id  \n" +
+            "LEFT JOIN algorithm a  ON sr.algorithm_id = a.id LEFT JOIN model_config mv ON mv.id = sr.vehicle_id  \n" +
             "where sr.scene_id = #{sceneId} order by sr.create_time desc" )
     List<SceneRiskPO> querySceneEvaluationRiskDetail(@Param("sceneId") String sceneId);