commit

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

@@ -166,6 +166,7 @@ public class TaskDomainService {
                 String task2Id = taskOfLeaf.getId();
                 // 计算复杂度和危险度
                 TaskEntity taskEntity = simulationManualProjectTaskMapper.selectById(task2Id);
+                log.info("查询任务实体： " + taskEntity);
                 String sceneId = taskEntity.getSceneId();
                 if (!StringUtils.isEmpty(projectEntity.getComplexityEvaluationRuleId())) {
                     SceneEvaluationComputeSubParam sceneEvaluationComputeSubParam = new SceneEvaluationComputeSubParam();

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

@@ -21,6 +21,7 @@ public interface IndexTemplateMapper {
             @Result(column = "scene_traffic_ids", property = "sceneTrafficIds", jdbcType = JdbcType.VARCHAR),
             @Result(column = "scene_statue_ids", property = "sceneStatueIds", jdbcType = JdbcType.VARCHAR),
             @Result(column = "scene_generalization_ids", property = "sceneGeneralizationIds", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "scene_reference_lib_ids", property = "sceneReferenceLibIds", jdbcType = JdbcType.VARCHAR),
             @Result(column = "weight", property = "weight", jdbcType = JdbcType.VARCHAR),
             @Result(column = "parent_id", property = "parentId", jdbcType = JdbcType.VARCHAR),
             @Result(column = "root_id", property = "rootId", jdbcType = JdbcType.VARCHAR),

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

@@ -20,6 +20,8 @@ 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 = "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)
     })
     @Select("select id,\n" +

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

@@ -36,7 +36,7 @@ public interface SimulationManualProjectTaskMapper {
     List<TaskEntity> selectTaskListByProjectId(@Param("projectId") String projectId);
 
     @ResultMap("task")
-    @Select("select p_id, create_user_id\n" +
+    @Select("select p_id, create_user_id, scene_id\n" +
             "from simulation_manual_project_task\n" +
             "where id = #{taskId}")
     TaskEntity selectById(@Param("taskId")String taskId);