tijiao

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/TaskController.java

@@ -1,12 +1,11 @@
 package com.css.simulation.resource.scheduler.adapter.controller;
 
 
+import api.common.pojo.param.project.MultiSimulationProjectKafkaParam;
+import com.css.simulation.resource.scheduler.app.service.ProjectApplicationService;
 import com.css.simulation.resource.scheduler.app.service.TaskApplicationService;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -17,6 +16,8 @@ public class TaskController {
 
     @Resource
     private TaskApplicationService taskApplicationService;
+    @Resource
+    private ProjectApplicationService projectApplicationService;
     //* -------------------------------- Comment --------------------------------
 
     /**
@@ -51,5 +52,15 @@ public class TaskController {
         taskApplicationService.multiState(taskId, state, podName);
     }
 
+    @PostMapping(path = "/runMultiProject", produces = "application/json;charset=utf-8")
+    public void runMultiProject(@RequestBody MultiSimulationProjectKafkaParam param) {
+        projectApplicationService.runMultiProject(param);
+    }
+
+    @PostMapping(path = "/stopMultiProject", produces = "application/json;charset=utf-8")
+    public void stopMultiProject(@RequestBody MultiSimulationProjectKafkaParam param) {
+        projectApplicationService.stopMultiProject(param);
+    }
+
 
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/ProjectApplicationService.java

@@ -2,6 +2,7 @@ package com.css.simulation.resource.scheduler.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.enums.MultiSimulationStatusEnum;
+import api.common.pojo.enums.MultiSimulationTaskStatusEnum;
 import api.common.pojo.param.project.MultiCreateYamlRet;
 import api.common.pojo.param.project.MultiSimulationProjectKafkaParam;
 import api.common.pojo.param.project.MultiSimulationProjectParam;
@@ -52,6 +53,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -121,9 +123,6 @@ public class ProjectApplicationService {
     private AlgorithmExpandMapper algorithmExpandMapper;
     @Resource
     private SimulationMapMapper mapMapper;
-    @Resource
-    private MultiSimulationSceneCarMapper sceneCarMapper;
-
     @Resource
     private MultiSimulationProjectMapper multiSimulationProjectMapper;
 
@@ -617,7 +616,7 @@ public class ProjectApplicationService {
         }
         log.info("项目" + projectId + "已经启动" + yamlList.size());
         for (MultiCreateYamlRet redisKey : yamlList) {
-            taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationStatusEnum.RUN_STATUS.getProjectStatus(), redisKey.getTaskId(), 0);
+            taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.RUN_STATUS.getProjectStatus(), redisKey.getTaskId(), 0);
         }
         // 保存每个机器的并行度
         projectDomainService.setMultiNodeMapUse(isChoiceGpu, multiNodeMapToUse);
@@ -1022,7 +1021,8 @@ public class ProjectApplicationService {
         projectDomainService.checkAlgorithmIsExpand(projectType, projectId, DictConstants.ALGORITHM_EXPAND_STATUS_NOT_TESTED);
     }
 
-    @Async("pool1")
+    // TODO 暂时注释
+//    @Async("pool1")
     public void runMultiProject(MultiSimulationProjectKafkaParam projectStartMessageEntity) {
         MultiProjectWaitQueueEntity multiTaskAndFixData = createMultiTaskAndFixData(projectStartMessageEntity);
         checkIfCanRunMulti(multiTaskAndFixData);
@@ -1031,11 +1031,17 @@ public class ProjectApplicationService {
 //    @Transactional
     public void stopMultiProject(MultiSimulationProjectKafkaParam projectKafkaParam) {
         String projectId = projectKafkaParam.getProjectId();
-        // 删除等待队列中的项目,,
+        // 删除等待队列中的项目
         removeMulti(projectId);
         String isChoiceGpu = DictConstants.USE_GPU;
-
         MultiSimulationProjectVO projectVO = multiSimulationProjectMapper.selectMultiSimulationProjectById(projectId);
+        if (projectVO.getProjectStatus() == MultiSimulationStatusEnum.TERMINATED_STATUS.getProjectStatus() ||
+            projectVO.getProjectStatus() == MultiSimulationStatusEnum.COMPLETED_STATUS.getProjectStatus()){
+            // 已完成或者已经是终止状态,不再处理
+            log.info("目前该多模式仿真任务已经是结束状态,不再进行停止操作,projectId:{},目前状态:{}", projectId,
+                MultiSimulationStatusEnum.matchStatusEnumByStatus(projectVO.getProjectStatus()).getProjectStatusValue());
+            return;
+        }
         Integer status = projectVO.getProjectStatus();
         MultiSimulationProjectParam multiSimulationProjectParam = new MultiSimulationProjectParam();
         multiSimulationProjectParam.setProjectId(projectId);
@@ -1048,8 +1054,8 @@ public class ProjectApplicationService {
         if (!CollectionUtils.isEmpty(recordPOList)){
             for (MultiSimulationProjectTaskRecordPO po: recordPOList) {
                 Integer recordStatus = po.getStatus();
-                if (recordStatus == MultiSimulationStatusEnum.RUN_STATUS.getProjectStatus()){
-                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationStatusEnum.TERMINATED_STATUS.getProjectStatus(), po.getId(), 1);
+                if (recordStatus == MultiSimulationTaskStatusEnum.RUN_STATUS.getProjectStatus()){
+                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.TERMINATED_STATUS.getProjectStatus(), po.getId(), 0);
                     // 删除pod
                     String nodeNameKey = "multi-taskId:" + po.getId();
                     String value = stringRedisTemplate.opsForValue().get(nodeNameKey);
@@ -1063,14 +1069,19 @@ public class ProjectApplicationService {
                     projectDomainService.incrementOneParallelism(isChoiceGpu, nodeName);
                     // 释放证书
                     projectDomainService.releaseLicense(clusterUserId, DictConstants.MODEL_TYPE_VTD, 1);
+
+                } else if (recordStatus == MultiSimulationTaskStatusEnum.INIT_STATUS.getProjectStatus()) {
+                    // 初始状态时
+                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.TERMINATED_STATUS.getProjectStatus(), po.getId(), 0);
+                }else if (recordStatus == MultiSimulationTaskStatusEnum.NEED_ANALYSIS_STATUS.getProjectStatus() || recordStatus == MultiSimulationTaskStatusEnum.AUTO_TERMINATED_STATUS.getProjectStatus()) {
+                    // 不作处理了
                 }
             }
             // 设置整个仿真项目
-            if (status == MultiSimulationStatusEnum.RUN_STATUS.getProjectStatus()){
+            if (status == MultiSimulationTaskStatusEnum.RUN_STATUS.getProjectStatus()){
                 multiSimulationProjectParam.setProjectStatus(MultiSimulationStatusEnum.TERMINATED_STATUS.getProjectStatus());
                 multiSimulationProjectMapper.updateMultiSimulationProjectStatus(multiSimulationProjectParam);
             }
-
             // 删除kafka topic
             KafkaUtil.deleteTopic(kafkaAdminClient, projectId);
             //6 删除项目 pod 启动文件
@@ -1091,9 +1102,10 @@ public class ProjectApplicationService {
         //* -------------------------------- 0 读取消息，创建临时目录 --------------------------------
         String projectId = projectStartMessageEntity.getProjectId();                // 手动执行项目 id 或 自动执行子项目 id
         try {
+            // 首先删掉历史的projectId记录
+            taskRecordMapper.deleteProjectByProjectId(projectId);
 
             List<MultiSimulationSceneKafkaParam> kafkaParamList = projectStartMessageEntity.getKafkaParamList();
-            
             List<MultiTaskMessageEntity> entityList = new ArrayList<>();
             for (MultiSimulationSceneKafkaParam kafkaParam: kafkaParamList) {
                 String taskId = StringUtil.getRandomUUID();
@@ -1152,7 +1164,11 @@ public class ProjectApplicationService {
                     if (vehicle == null){
                         String carId = sceneCar.getCarId();
                         //1 根据车辆配置id vehicleConfigId, 获取 模型信息和传感器信息
-                        com.css.simulation.resource.scheduler.infra.entity.VehicleEntity vehicleEntity = vehicleMapper.selectByVehicleConfigId(carId);   // 车辆
+//                        com.css.simulation.resource.scheduler.infra.entity.VehicleEntity vehicleEntity = vehicleMapper.selectByVehicleConfigId(carId);   // 车辆
+                        // TODO 上线之前删掉
+                        com.css.simulation.resource.scheduler.infra.entity.VehicleEntity vehicleEntity = com.css.simulation.resource.scheduler.infra.entity.VehicleEntity.builder()
+                            .modelLabel("AudiA6_10").maxSpeed(new BigDecimal("67")).enginePower(new BigDecimal("150000"))
+                            .build();
                         List<CameraEntity> cameraEntityList = sensorCameraMapper.selectCameraByVehicleConfigId(carId);    // 摄像头
                         List<OgtEntity> ogtEntityList = sensorOgtMapper.selectOgtByVehicleId(carId); // 完美传感器
                         vehicle = VehicleEntity.builder().model(ModelEntity.builder().model_label(vehicleEntity.getModelLabel()).build())
@@ -1170,7 +1186,7 @@ public class ProjectApplicationService {
                 String mapXmlLinuxPath = linuxTempPath + "multiProject/" + projectId + "/" + taskId + "/" + taskId + ".xml";
                 String mapJsonLinuxPath = linuxTempPath + "multiProject/" + projectId + "/" + taskId + "/" + taskId + ".json";
                 FileUtil.writeStringToLocalFile(carJson.toJSONString(), mapJsonLinuxPath);
-                String linuxComm = multiVtdXmlGenerator + " " + mapXmlLinuxPath + " " + mapXmlLinuxPath;
+                String linuxComm = multiVtdXmlGenerator + " " + mapJsonLinuxPath + " " + mapXmlLinuxPath;
                 LinuxUtil.execute(linuxComm);
                 String mapXmlPathOfMinio = projectResultPathOfMinio + minioUploadPath + taskId + ".xml";
                 MinioUtil.uploadFromFile(minioClient, mapXmlLinuxPath, bucketName, mapXmlPathOfMinio);
@@ -1181,13 +1197,13 @@ public class ProjectApplicationService {
                         .default_time(Long.valueOf(projectStartMessageEntity.getDefaultTime()))
                         .task_path(projectResultPathOfMinio + minioUploadPath).build())
                     .scenario(ScenarioEntity.builder().scenario_osc(mapXmlPathOfMinio).scenario_odr(mapDriverPathOfMinio).scenario_osgb(mapOsgPathOfMinio).build())
-                    .vehicleEntity(vehicle)
+                    .vehicle(vehicle)
                     .build();
                 entityList.add(build);
             }
             int sort = 0;
             for (MultiTaskMessageEntity entity: entityList) {
-                taskRecordMapper.addMultiSimulationProjectTaskRecord(entity.getInfo().getTask_id(), entity.getInfo().getScene_id(), entity.getInfo().getProject_id(),
+                int i = taskRecordMapper.addMultiSimulationProjectTaskRecord(entity.getInfo().getTask_id(), entity.getInfo().getScene_id(), entity.getInfo().getProject_id(),
                     JSONObject.toJSONString(entity), sort);
                 sort ++;
             }
@@ -1197,7 +1213,9 @@ public class ProjectApplicationService {
                 .projectId(projectId)
                 .waitingParallelism(entityList.size())
                 .kafkaParamList(kafkaParamList)
+                .runState(-1)
                 .build();
+            log.info("MultiProjectWaitQueueEntity返回结果:{}", JSONObject.toJSONString(build));
             return build;
         } catch (Exception e) {
             log.error("项目报错。", e);

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/TaskApplicationService.java

@@ -234,7 +234,6 @@ public class TaskApplicationService {
         customRedisClient.lock(lock1, 1L, 30 * 60L);
         String isChoiceGpu = DictConstants.USE_GPU;
         try {
-
             MultiSimulationProjectVO projectVO = multiSimulationProjectMapper.selectMultiSimulationProjectById(projectId);
 //            Integer status = projectVO.getProjectStatus();
             MultiSimulationProjectParam multiSimulationProjectParam = new MultiSimulationProjectParam();
@@ -336,7 +335,7 @@ public class TaskApplicationService {
                 //7 删除项目临时文件
                 FileUtil.rm(linuxTempPath + "multiProject/" + projectId + "/");
                 // 删除minio临时文件
-                MinioUtil.rmR(minioClient, bucketName, projectResultPathOfMinio + projectId + "/");
+//                MinioUtil.rmR(minioClient, bucketName, projectResultPathOfMinio + projectId + "/");
                 // 删除算法key
                 // 删除yaml路径redis
                 // 删除记录podNamekey

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

@@ -264,8 +264,8 @@ public class ProjectDomainService {
             String tempInit = algorithmInitStr.replace("algorithm-image", algorithmImage);
             stringBufferInit.append(tempInit);
         }
-        podString.replace("algorithmContainerDemo", stringBuffer.toString());
-        podString.replace("algorithmContainerInit", stringBufferInit.toString());
+        podString = podString.replace("algorithmContainerDemo", stringBuffer.toString());
+        podString = podString.replace("algorithmContainerInit", stringBufferInit.toString());
 
         log.info("保存项目projectId:" + projectId + "sceneId:" + messageEntity.getInfo().getScene_id() + "的 yaml 文件：" + yamlPath);
         FileUtil.writeStringToLocalFile(podString, yamlPath);

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

@@ -4,50 +4,30 @@ import api.common.pojo.param.project.MultiSimulationProjectParam;
 import api.common.pojo.po.project.MultiSimulationProjectPO;
 import api.common.pojo.vo.project.MultiSimulationProjectVO;
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.List;
 
 @Mapper
 public interface MultiSimulationProjectMapper {
-    @Select("<script>" +
-        "select id,project_key,project_name,project_status,create_time from multi_simulation_project where deleted = 0 " +
-        "<if test='projectKey != null'> " +
-        " AND project_key = #{projectKey}" +
-        "</if>" +
-        "<if test='projectName != null'> " +
-        " AND project_name = #{projectName}" +
-        "</if>" +
-        "<if test='projectStatus != null'> " +
-        " AND project_status = #{projectStatus}" +
-        "</if>" +
-        "<if test='projectId != null'> " +
-        " AND project_id = #{projectId}" +
-        "</if>" +
-        "order by create_time desc" +
-        "</script>")
-    List<MultiSimulationProjectVO> selectProjectList(MultiSimulationProjectParam param);
-
-
-    @Insert("insert into multi_simulation_project (id,project_key,project_name,project_description,project_max_seconds,project_status) values" +
-        "(#{id},#{projectKey},#{projectName},#{projectDescription},#{projectMaxSeconds},#{projectStatus})")
-    int  addMultiSimulationProject(MultiSimulationProjectPO projectPO);
-
-    @Select("select id,project_key,project_name,project_status,create_time from multi_simulation_project where deleted = 0 " +
-        "and project_name = #{projectName} limit 1")
-    MultiSimulationProjectVO selectMultiSimulationProjectByName(@Param("projectName") String projectName);
-
-    @Delete("delete from multi_simulation_project where id = #{id}")
-    int deleteMultiSimulationProject(@Param("id") String id);
-
-    @Update("update multi_simulation_project set project_name = #{projectName}, project_description = #{projectDescription}," +
-        "project_max_seconds = #{projectMaxSeconds} where id = #{projectId}")
-    int updateMultiSimulationProject(MultiSimulationProjectParam param);
+//    @Results(id = "multiSimulationProjectRes", value = {
+//        @Result(column = "id", property = "id", jdbcType = JdbcType.VARCHAR),
+//        @Result(column = "project_key", property = "projectKey", jdbcType = JdbcType.VARCHAR),
+//        @Result(column = "project_user_id", property = "projectUserId", jdbcType = JdbcType.VARCHAR),
+//        @Result(column = "project_name", property = "projectName", jdbcType = JdbcType.VARCHAR),
+//        @Result(column = "project_description", property = "projectDescription", jdbcType = JdbcType.VARCHAR),
+//        @Result(column = "project_max_seconds", property = "projectMaxSeconds", jdbcType = JdbcType.INTEGER),
+//        @Result(column = "project_status", property = "projectStatus", jdbcType = JdbcType.INTEGER),
+//        @Result(column = "deleted", property = "deleted", jdbcType = JdbcType.INTEGER),
+//        @Result(column = "create_time", property = "createTime", jdbcType = JdbcType.TIMESTAMP),
+//        @Result(column = "update_time", property = "updateTime", jdbcType = JdbcType.TIMESTAMP)
+//    })
 
     @Update("update multi_simulation_project set project_status = #{projectStatus} " +
         "where id = #{projectId}")
     int updateMultiSimulationProjectStatus(MultiSimulationProjectParam param);
 
-    @Select("select id,project_key,project_name,project_status,create_time,project_description from multi_simulation_project where deleted = 0 " +
+    @Select("select id,project_key as projectKey,project_name as projectName,project_status as projectStatus,create_time as createTime,project_description as projectDescription from multi_simulation_project where deleted = 0 " +
         "and id = #{id} limit 1")
     MultiSimulationProjectVO selectMultiSimulationProjectById(@Param("id") String projectId);
 }

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

@@ -11,13 +11,6 @@ import java.util.List;
 
 @Mapper
 public interface MultiSimulationProjectResultMapper {
-    @Select("<script>" +
-        "select id,scene_id,abnormal_type,abnormal_time from multi_simulation_project_result where deleted = 0 " +
-        "and scene_id = #{sceneId}" +
-        "order by abnormal_time,create_time desc" +
-        "</script>")
-    List<MultiSimulationProjectResultVO> selectProjectResultList(MultiSimulationProjectResultParam param);
-
     @Insert("<script>" +
         "insert into multi_simulation_project_result (id,scene_id,abnormal_type,abnormal_time_description) values" +
         "(#{id},#{sceneId},#{abnormalType},#{abnormalTimeDescription})" +

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

@@ -2,11 +2,24 @@ package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 import api.common.pojo.po.project.MultiSimulationProjectTaskRecordPO;
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.List;
 
 @Mapper
 public interface MultiSimulationProjectTaskRecordMapper {
+//    @Results(id = "multiSimulationProjectTaskRecordRes", value = {
+//        @Result(column = "id", property = "id", jdbcType = JdbcType.VARCHAR),
+//        @Result(column = "scene_id", property = "sceneId", jdbcType = JdbcType.VARCHAR),
+//        @Result(column = "project_id", property = "projectId", jdbcType = JdbcType.VARCHAR),
+//        @Result(column = "task_body", property = "taskBody", jdbcType = JdbcType.VARCHAR),
+//        @Result(column = "status", property = "status", jdbcType = JdbcType.INTEGER),
+//        @Result(column = "sort", property = "sort", jdbcType = JdbcType.INTEGER),
+//        @Result(column = "deleted", property = "deleted", jdbcType = JdbcType.INTEGER),
+//        @Result(column = "create_time", property = "createTime", jdbcType = JdbcType.TIMESTAMP),
+//        @Result(column = "update_time", property = "updateTime", jdbcType = JdbcType.TIMESTAMP)
+//    })
+
     @Insert("insert into multi_simulation_project_task_record (id,scene_id,project_id,task_body,status,sort) values" +
         "(#{id},#{sceneId},#{projectId},#{taskBody},0,#{sort})")
     int addMultiSimulationProjectTaskRecord(@Param("id") String id, @Param("sceneId") String sceneId, @Param("projectId") String projectId, @Param("taskBody") String taskBody, @Param("sort") Integer sort);
@@ -15,22 +28,14 @@ public interface MultiSimulationProjectTaskRecordMapper {
         "where id = #{taskId}")
     int updateMultiSimulationProjectTaskRecordStatus(@Param("status") Integer status, @Param("taskId") String taskId, @Param("deleted") Integer deleted);
 
-    @Select("select id,project_id,scene_id,task_body,status,sort multi_simulation_project_task_record where project_id = #{projectId} and deleted = 0")
+    @Select("select id,project_id as projectId,scene_id as sceneId,task_body as taskBody,status,sort from multi_simulation_project_task_record where project_id = #{projectId} and deleted = 0")
     List<MultiSimulationProjectTaskRecordPO> selectMultiSimulationProjectTaskRecordList(@Param("projectId") String projectId);
 
-    @Select("select id,project_id,scene_id,task_body,status,sort multi_simulation_project_task_record where id = #{taskId} and deleted = 0")
+    @Select("select id,project_id as projectId,scene_id as sceneId,task_body as taskBody,status,sort from multi_simulation_project_task_record where id = #{taskId} and deleted = 0")
     MultiSimulationProjectTaskRecordPO selectMultiSimulationProjectTaskRecordById(@Param("taskId") String taskId);
 
-//    @Select("select * from multi_simulation_project where deleted = 0 " +
-//        "and id = #{id}")
-//    MultiSimulationProjectTaskRecordPO selectMultiSimulationTaskByTaskId(@Param("id") String id);
-//
-//    @Select("select * from multi_simulation_project where deleted = 0 " +
-//        "and scene_id = #{sceneId}")
-//    MultiSimulationProjectTaskRecordPO selectMultiSimulationTaskBySceneId(@Param("sceneId") String sceneId);
-//
-//    @Select("select * from multi_simulation_project where deleted = 0 " +
-//        "and project_id = #{projectId} order by sort,create_time asc")
-//    List<MultiSimulationProjectTaskRecordPO> selectMultiSimulationTaskProjectId(@Param("projectId") String projectId);
+    @Delete("delete from multi_simulation_project_task_record where project_id = #{projectId}")
+    int deleteProjectByProjectId(@Param("projectId") String projectId);
+
 
 }

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

@@ -1,48 +0,0 @@
-package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
-
-import api.common.pojo.param.project.MultiSimulationSceneCarParam;
-import api.common.pojo.vo.project.MultiSimulationSceneCarVO;
-import org.apache.ibatis.annotations.*;
-
-import java.util.List;
-
-@Mapper
-public interface MultiSimulationSceneCarMapper {
-    @Insert("insert into multi_simulation_scene_car (id,scene_id,car_id,algorithm_id,algorithm_type,path_id,path_start,path_end,path_start_point,path_end_point,car_sort,is_simulation_car) values" +
-        "(#{sceneCarId},#{sceneId},#{carId},#{algorithmId},#{algorithmType},#{pathId},#{pathStart},#{pathEnd},#{pathStartPoint},#{pathEndPoint},#{carSort},#{isSimulationCar})")
-    int addMultiSimulationSceneCar(MultiSimulationSceneCarParam param);
-
-    @Select("select count(*) from multi_simulation_scene_car where scene_id = #{sceneId} and deleted = 0")
-    int selectSceneCarNumsBySceneId(@Param("sceneId") String sceneId);
-
-
-    @Update("<script>" +
-        "update multi_simulation_scene_car set car_id = #{carId},algorithm_id = #{algorithmId}, algorithm_type = #{algorithmType}, path_id = #{pathId}," +
-        "path_start = #{pathStart},path_end = #{pathEnd},path_start_point = #{pathStartPoint},path_end_point = #{pathEndPoint},car_sort = #{carSort} " +
-        "where id = #{sceneCarId}" +
-        "</script>")
-    int updateMultiSimulationSceneCar(MultiSimulationSceneCarParam param);
-
-    @Update("<script>" +
-        "update multi_simulation_scene_car set is_simulation_car = #{isSimulationCar} " +
-        "where id = #{id}" +
-        "</script>")
-    int updateMultiSimulationSceneCarView(@Param("id") String id, @Param("isSimulationCar") Integer isSimulationCar);
-
-    @Update("update multi_simulation_scene_car set deleted = 1 where id = #{sceneCarId}")
-    int deleteMultiSimulationSceneCar(MultiSimulationSceneCarParam param);
-//
-    @Select("<script>" +
-        "select id,scene_id,car_id,algorithm_id,algorithm_type,path_id,path_start,path_end,path_start_point,path_end_point,car_sort,create_time from multi_simulation_scene_car where deleted = 0 " +
-        "and scene_id = #{sceneId}" +
-        "order by car_sort, create_time desc" +
-        "</script>")
-    List<MultiSimulationSceneCarVO> selectSceneCarList(MultiSimulationSceneCarParam param);
-
-    @Select("<script>" +
-        "select id,scene_id,car_id,algorithm_id,algorithm_type,path_id,path_start,path_end,path_start_point,path_end_point,car_sort,create_time from multi_simulation_scene_car where deleted = 0 " +
-        "and id = #{sceneCarId}" +
-        "</script>")
-    MultiSimulationSceneCarVO selectSceneCarById(MultiSimulationSceneCarParam param);
-
-}

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

@@ -9,35 +9,5 @@ import java.util.List;
 
 @Mapper
 public interface MultiSimulationSceneMapper {
-    @Insert("insert into multi_simulation_scene (id,project_id) values" +
-        "(#{id},#{projectId})")
-    int addMultiSimulationScene(MultiSimulationScenePO scenePO);
-
-    @Insert("insert into multi_simulation_scene (id,project_id, scene_name,map_id) values" +
-        "(#{id},#{projectId},#{sceneName},#{mapId})")
-    int addMultiSimulationSceneAll(MultiSimulationScenePO scenePO);
-
-    @Update("update multi_simulation_scene set map_id = #{mapId}" +
-        " where id = #{sceneId}")
-    int updateMultiSimulationSceneMapId(@Param("mapId")String mapId, @Param("sceneId")String sceneId);
-
-    @Select("select count(*) from multi_simulation_scene where project_id = #{projectId} and deleted = 0")
-    int selectSceneNumsByProjectId(@Param("projectId") String projectId);
-
-    @Update("update multi_simulation_scene set deleted = 1 where id = #{sceneId}")
-    int deleteMultiSimulationScene(MultiSimulationSceneParam param);
-
-    @Select("<script>" +
-        "select id,project_id,scene_name,map_id,create_time from multi_simulation_scene where deleted = 0 " +
-        "and project_id = #{projectId}" +
-        "order by create_time desc" +
-        "</script>")
-    List<MultiSimulationSceneVO> selectSceneList(MultiSimulationSceneParam param);
-
-    @Select("<script>" +
-        "select id,project_id,scene_name,map_id,create_time,project_result_overall_url,project_result_simulation_url from multi_simulation_scene where deleted = 0 " +
-        "and id = #{sceneId}" +
-        "</script>")
-    MultiSimulationSceneVO selectSceneDetailBySceneId(@Param("sceneId") String sceneId);
 
 }

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

@@ -1,46 +1,17 @@
 package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 import api.common.pojo.param.map.SimulationMapParam;
-import api.common.pojo.po.map.SimulationMapPO;
 import api.common.pojo.vo.map.SimulationMapVO;
 import org.apache.ibatis.annotations.*;
 
-import java.util.List;
-
 @Mapper
 public interface SimulationMapMapper {
-    @Insert("insert into simulation_map (id,map_code,map_name,map_json,map_osgb_path,map_path,map_description,path_num) values" +
-        "(#{id},#{mapCode},#{mapName},#{mapJson},#{mapOsgbPath},#{mapPath},#{mapDescription},#{pathNum})")
-    int addSimulationMap(SimulationMapPO scenePO);
-
-    @Select("select id,path_num,map_name,map_osgb_path,map_path,map_description,create_time from simulation_map where id = #{id} and deleted = 0")
-    SimulationMapVO selectMapByMapId(@Param("id") String mapId);
+    @Select("select id,path_num as pathNum,map_name as mapName,map_osgb_path as mapOsgbPath,map_path as mapPath,map_description mapDescription,create_time as createTime,deleted from simulation_map where id = #{mapId} and deleted = 0")
+    SimulationMapVO selectMapByMapId(@Param("mapId") String mapId);
 
     @Update("update simulation_map set deleted = 1 where id = #{mapId}")
     int deleteMultiSimulationScene(SimulationMapParam param);
 
-    @Update("update simulation_map set map_path = #{mapPath},map_description = #{mapDescription} where id = #{mapId}")
-    int updateMultiSimulationScene(SimulationMapParam param);
-
-
-//
-//    @Select("<script>" +
-//        "select id,project_id,scene_name,map_id,create_time from multi_simulation_scene where deleted = 0 " +
-//        "and project_id = #{projectId}" +
-//        "order by create_time desc" +
-//        "</script>")
-//    List<MultiSimulationSceneVO> selectSceneList(MultiSimulationSceneParam param);
 
-    @Select("<script>" +
-        "select id,map_name,map_description,path_num,create_time from simulation_map where deleted = 0 " +
-        "<if test='mapName != null'> " +
-        " AND map_name = #{mapName}" +
-        "</if>" +
-        "<if test='mapDescription != null'> " +
-        " AND map_description = #{mapDescription}" +
-        "</if>" +
-        "order by create_time desc" +
-        "</script>")
-    List<SimulationMapVO> selectSimulationMapList(SimulationMapParam param);
 
 }

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

@@ -11,32 +11,5 @@ import java.util.List;
 
 @Mapper
 public interface SimulationMapPathMapper {
-    @Insert("insert into simulation_map_path (id,map_id,path_sort,path_detail,path_start_point,path_end_point,start_point_num,end_point_num) values" +
-        "(#{id},#{mapId},#{pathSort},#{pathDetail},#{pathStartPoint},#{pathEndPoint},#{startPointNum},#{endPointNum})")
-    int addSimulationMap(SimulationMapPathPO simulationMapPathPO);
-
-//    @Select("select id,path_num,map_name,map_description,create_time from simulation_map where id = #{id} and deleted = 0")
-//    SimulationMapVO selectMapByMapId(@Param("id") String mapId);
-//
-//    @Update("update simulation_map set deleted = 1 where id = #{mapId}")
-//    int deleteMultiSimulationScene(SimulationMapParam param);
-//
-//    @Update("update simulation_map set map_path = #{mapPath},map_description = #{mapDescription} where id = #{mapId}")
-//    int updateMultiSimulationScene(SimulationMapParam param);
-
-
-//
-//    @Select("<script>" +
-//        "select id,project_id,scene_name,map_id,create_time from multi_simulation_scene where deleted = 0 " +
-//        "and project_id = #{projectId}" +
-//        "order by create_time desc" +
-//        "</script>")
-//    List<MultiSimulationSceneVO> selectSceneList(MultiSimulationSceneParam param);
-
-    @Select("<script>" +
-        "select id,map_id,path_sort,path_detail,path_start_point,path_end_point,start_point_num,end_point_num from simulation_map_path where deleted = 0 and map_id =#{mapId} " +
-        "order by path_sort asc" +
-        "</script>")
-    List<SimulationMapPathVO> selectSimulationMapPathList(SimulationMapPathParam param);
 
 }

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

@@ -19,6 +19,6 @@ public class MultiTaskMessageEntity {
 
     private MultiInfoEntity info;
     private ScenarioEntity scenario;
-    private VehicleEntity vehicleEntity;
+    private VehicleEntity vehicle;
 
 }