算法平台

api-common/src/main/java/api/common/pojo/param/algorithm/AlgorithmParameter.java

@@ -9,6 +9,7 @@ import lombok.*;
 @NoArgsConstructor
 public class AlgorithmParameter extends PageParameter {
     private String id;                  // id
+    private String algorithmId;                  // id
     private String algorithmName;       // 算法名称
     private String algorithmCode;       // 算法ID
     private String description;         // 算法描述

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/AlgoPlatformService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/AlgoPlatformService.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.acl.feign;
+package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.server.acl.feign.fallback.AlgoPlatformServiceFallback;
+import com.css.simulation.resource.server.acl.impl.AlgoPlatformServiceFallback;
 import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/FileDownService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/FileDownService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl.feign;
+package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.MinioParameter;
 import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.server.acl.feign.fallback.FileDownServiceFallback;
+import com.css.simulation.resource.server.acl.impl.FileDownServiceFallback;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/KafkaService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/KafkaService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl.feign;
+package com.css.simulation.resource.server.acl;
 
 
 import api.common.pojo.param.KafkaParameter;
 import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.server.acl.feign.fallback.KafkaServiceFallback;
+import com.css.simulation.resource.server.acl.impl.KafkaServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/MonitorService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/MonitorService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl.feign;
+package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.server.acl.feign.fallback.MonitorServiceFallback;
+import com.css.simulation.resource.server.acl.impl.MonitorServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/OauthClientService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/OauthClientService.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.server.acl.feign;
+package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.server.acl.feign.fallback.RedisServiceFallback;
+import com.css.simulation.resource.server.acl.impl.RedisServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/RedisService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/RedisService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl.feign;
+package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;
 import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.server.acl.feign.fallback.RedisServiceFallback;
+import com.css.simulation.resource.server.acl.impl.RedisServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/SceneService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/SceneService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl.feign;
+package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.system.SceneImportPO;
 import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.server.acl.feign.fallback.SceneServiceFallback;
+import com.css.simulation.resource.server.acl.impl.SceneServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/SchedulerService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/SchedulerService.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.server.acl.feign;
+package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.server.acl.feign.fallback.SchedulerServiceFallback;
+import com.css.simulation.resource.server.acl.impl.SchedulerServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/AlgoPlatformServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/impl/AlgoPlatformServiceFallback.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.acl.feign.fallback;
+package com.css.simulation.resource.server.acl.impl;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.server.acl.feign.AlgoPlatformService;
+import com.css.simulation.resource.server.acl.AlgoPlatformService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/FileDownServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/impl/FileDownServiceFallback.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.server.acl.feign.fallback;
+package com.css.simulation.resource.server.acl.impl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.MinioParameter;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
+import com.css.simulation.resource.server.acl.FileDownService;
 import feign.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/KafkaServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/impl/KafkaServiceFallback.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.acl.feign.fallback;
+package com.css.simulation.resource.server.acl.impl;
 
 import api.common.pojo.param.KafkaParameter;
-import com.css.simulation.resource.server.acl.feign.KafkaService;
+import com.css.simulation.resource.server.acl.KafkaService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/MonitorServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/impl/MonitorServiceFallback.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.server.acl.feign.fallback;
+package com.css.simulation.resource.server.acl.impl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
-import com.css.simulation.resource.server.acl.feign.MonitorService;
+import com.css.simulation.resource.server.acl.MonitorService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/OauthClientServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/impl/OauthClientServiceFallback.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.acl.feign.fallback;
+package com.css.simulation.resource.server.acl.impl;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.server.acl.feign.OauthClientService;
+import com.css.simulation.resource.server.acl.OauthClientService;
 import org.springframework.stereotype.Component;
 
 @Component

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/RedisServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/impl/RedisServiceFallback.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.server.acl.feign.fallback;
+package com.css.simulation.resource.server.acl.impl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;
-import com.css.simulation.resource.server.acl.feign.RedisService;
+import com.css.simulation.resource.server.acl.RedisService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/SceneServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/impl/SceneServiceFallback.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.server.acl.feign.fallback;
+package com.css.simulation.resource.server.acl.impl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.system.SceneImportPO;
-import com.css.simulation.resource.server.acl.feign.SceneService;
+import com.css.simulation.resource.server.acl.SceneService;
 import org.springframework.stereotype.Component;
 
 @Component

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/SchedulerServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/impl/SchedulerServiceFallback.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.acl.feign.fallback;
+package com.css.simulation.resource.server.acl.impl;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.server.acl.feign.SchedulerService;
+import com.css.simulation.resource.server.acl.SchedulerService;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestParam;
 @Component

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/FileController.java

@@ -5,7 +5,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.MinioParameter;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
+import com.css.simulation.resource.server.acl.FileDownService;
 import feign.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/AlgorithmPlatformResultController.java

@@ -5,7 +5,7 @@ import api.common.pojo.vo.project.ProjectReportVO;
 import api.common.pojo.vo.project.ProjectResultWithAlgorithmVO;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.server.api.parameter.ProjectParam;
-import com.css.simulation.resource.server.application.service.job_manage.JobManageApplication;
+import com.css.simulation.resource.server.application.service.job_manage.JobManageApplicationService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,7 +23,7 @@ public class AlgorithmPlatformResultController {
 
 
     @Resource
-    private JobManageApplication jobManageApplication;
+    private JobManageApplicationService jobManageApplicationService;
 
 
     /**
@@ -42,8 +42,8 @@ public class AlgorithmPlatformResultController {
         for (String algorithmId : algorithmIdArray) {
             result.add(ProjectResultWithAlgorithmVO.builder()
                     .algorithmId(algorithmId)
-                    .report(jobManageApplication.getLastProjectReportByAlgorithmId(algorithmId))
-                    .videos(jobManageApplication.getLastVideoListByAlgorithmId(algorithmId))
+                    .report(jobManageApplicationService.getLastProjectReportByAlgorithmId(algorithmId))
+                    .videos(jobManageApplicationService.getLastVideoListByAlgorithmId(algorithmId))
                     .build());
         }
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, result);
@@ -61,7 +61,7 @@ public class AlgorithmPlatformResultController {
             return new ResponseBodyVO<>(false, 500, "参数必传！", null);
         }
         String algorithmId = projectParam.getAlgorithmId();
-        ProjectReportVO projectReportVO = jobManageApplication.getLastProjectReportByAlgorithmId(algorithmId);
+        ProjectReportVO projectReportVO = jobManageApplicationService.getLastProjectReportByAlgorithmId(algorithmId);
 
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectReportVO);
     }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/personal_information/UserInfoController.java

@@ -11,7 +11,7 @@ import api.common.pojo.vo.system.ParameterVO;
 import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageSublistMapper;
 import com.css.simulation.resource.server.application.service.SystemScenePackageService;
 import com.css.simulation.resource.server.application.service.ClusterService;
 import com.css.simulation.resource.server.application.service.ParameterService;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/general/SceneGeneralController.java

@@ -12,7 +12,7 @@ import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
+import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.application.service.LogService;
 import com.css.simulation.resource.server.application.service.SceneGeneralExampleService;
 import com.css.simulation.resource.server.application.service.SceneGeneralTemplateService;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/scene_test_package/SceneTestPackageController.java

@@ -10,10 +10,10 @@ import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
 import com.css.simulation.resource.server.application.service.ScenePackageService;
 import com.css.simulation.resource.server.application.service.ParameterService;
-import com.css.simulation.resource.server.infrastructure.util.SceneUtil;
+import com.css.simulation.resource.server.infrastructure.common.util.SceneUtil;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/scene_upload/SceneUploadController.java

@@ -6,7 +6,7 @@ import api.common.pojo.param.system.SceneImportPageParam;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.server.infrastructure.common.oauth.AuthorizationHolder;
-import com.css.simulation.resource.server.acl.feign.SceneService;
+import com.css.simulation.resource.server.acl.SceneService;
 import com.css.simulation.resource.server.application.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/AlgorithmServiceImpl.java

@@ -10,9 +10,9 @@ import api.common.pojo.po.algorithm.AlgorithmPO;
 import api.common.pojo.vo.algorithm.AlgorithmVO;
 import api.common.pojo.vo.algorithm.RunningProjectVO;
 import api.common.util.*;
-import com.css.simulation.resource.server.acl.feign.AlgoPlatformService;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
-import com.css.simulation.resource.server.acl.feign.SchedulerService;
+import com.css.simulation.resource.server.acl.AlgoPlatformService;
+import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.acl.SchedulerService;
 import com.css.simulation.resource.server.application.service.AlgorithmService;
 import com.css.simulation.resource.server.application.service.DictService;
 import com.css.simulation.resource.server.application.service.SimulationProjectService;
@@ -21,8 +21,8 @@ import com.css.simulation.resource.server.infrastructure.common.configuration.gi
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.AlgorithmExpandMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.AlgorithmMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.AlgorithmExpandMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.AlgorithmMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
@@ -187,14 +187,14 @@ public class AlgorithmServiceImpl implements AlgorithmService {
         // 此接口在此处只作为同步更新数据到仿真云数据库，分页查询通过仿真云数据库来查
         algoPlatformService.getAlgorithmList(urlParam);
         //2 查询仿真数据库里的数据
+        PageHelper.startPage(page, size);
+        final List<AlgorithmVO> algorithmVOS;
         if (admin) {
-            PageHelper.startPage(page, size);
-            final List<AlgorithmVO> algorithmVOS = algorithmExpandMapper.select(param);
+            algorithmVOS = algorithmExpandMapper.select(param);
             PageInfo<AlgorithmVO> objectPageInfo = new PageInfo<>(algorithmVOS);
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, objectPageInfo);
         } else {
-            PageHelper.startPage(page, size);
-            final List<AlgorithmVO> algorithmVOS = algorithmExpandMapper.selectWithNoTeam(param);
+            algorithmVOS = algorithmExpandMapper.selectWithNoTeam(param);
             PageInfo<AlgorithmVO> objectPageInfo = new PageInfo<>(algorithmVOS);
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, objectPageInfo);
         }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/SimulationProjectServiceImpl.java

@@ -22,19 +22,19 @@ import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.vo.project.*;
 import api.common.util.*;
 import com.css.simulation.resource.server.domain.service.UserDomainService;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.*;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.*;
 import com.css.simulation.resource.server.application.service.AlgorithmService;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
-import com.css.simulation.resource.server.acl.feign.AlgoPlatformService;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
-import com.css.simulation.resource.server.acl.feign.MonitorService;
-import com.css.simulation.resource.server.infrastructure.enums.ProjectRunStateEnum;
-import com.css.simulation.resource.server.infrastructure.enums.SceneTypeEnum;
+import com.css.simulation.resource.server.acl.AlgoPlatformService;
+import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.acl.MonitorService;
+import com.css.simulation.resource.server.infrastructure.common.enums.ProjectRunStateEnum;
+import com.css.simulation.resource.server.infrastructure.common.enums.SceneTypeEnum;
 import com.css.simulation.resource.server.application.service.SimulationProjectService;
-import com.css.simulation.resource.server.infrastructure.util.PdfBuilder;
+import com.css.simulation.resource.server.infrastructure.common.util.PdfBuilder;
 import com.css.simulation.resource.server.application.service.DictService;
-import com.css.simulation.resource.server.infrastructure.util.ProjectUtil;
+import com.css.simulation.resource.server.infrastructure.common.util.ProjectUtil;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.ImmutableMap;
 import com.itextpdf.text.*;
@@ -73,7 +73,7 @@ import java.util.zip.ZipOutputStream;
 public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     @Resource
-    private SimulationProjectMapper simulationProjectMapper;
+    private SimulationManualProjectMapper simulationManualProjectMapper;
     @Resource
     private ManualProjectMapper manualProjectMapper;
     @Resource
@@ -81,9 +81,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     @Resource
     private SimulationAutomaticProjectMapper simulationAutomaticProjectMapper;
     @Resource
-    private SimulationProjectTaskMapper simulationProjectTaskMapper;
+    private SimulationManualProjectTaskMapper simulationManualProjectTaskMapper;
     @Resource
-    private SimulationAutomaticSubProjectMapper simulationAutomaticSubProjectMapper;
+    private SimulationAutomaticSubprojectMapper simulationAutomaticSubProjectMapper;
     @Resource
     private SimulationMptFirstTargetScoreMapper simulationMptFirstTargetScoreMapper;
     @Resource
@@ -123,26 +123,26 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         if (isEmpty(param.getId())) {
             // 工作名称一样的的不能创建
-            List<SimulationManualProjectPO> simulationManualProjectPOS = simulationProjectMapper.selectProjectByName(param);
+            List<SimulationManualProjectPO> simulationManualProjectPOS = simulationManualProjectMapper.selectProjectByName(param);
             if (!isEmpty(simulationManualProjectPOS)) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "工作名称已经存在，请修改后再保存。");
             }
             po.createPo(AuthUtil.getCurrentUserId());
             // 生成id
             createProjectId(po);
-            int add = simulationProjectMapper.add(po);
+            int add = simulationManualProjectMapper.add(po);
             if (add > 0) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, ResponseBodyVO.Response.SUCCESS.getMessage(), po.getId());
             }
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "添加失败。");
         } else {
             // 取工作状态，仅未开始的才可以修改信息
-            SimulationManualProjectPO simulationManualProjectPo = simulationProjectMapper.selectProjectById(param);
+            SimulationManualProjectPO simulationManualProjectPo = simulationManualProjectMapper.selectProjectById(param);
             if (!ProjectRunStateEnum.NOT_START.getCode().equals(simulationManualProjectPo.getNowRunState())) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "当前状态不支持修改。");
             }
             po.updatePo(AuthUtil.getCurrentUserId());
-            int update = simulationProjectMapper.update(po);
+            int update = simulationManualProjectMapper.update(po);
             if (update > 0) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, ResponseBodyVO.Response.SUCCESS.getMessage(), po.getId());
             }
@@ -194,7 +194,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // 查询有效数据
         param.setIsDeleted("0");
         setPage(param.getCurrentPage() == null ? 1 : param.getCurrentPage(), param.getPageSize() == null ? 10 : param.getPageSize());
-        List<SimulationManualProjectVO> vos = simulationProjectMapper.selectProjectList(param); // 查出来的 algorithm
+        List<SimulationManualProjectVO> vos = simulationManualProjectMapper.selectProjectList(param); // 查出来的 algorithm
         // 字段内容是算法 id
         PageInfo<SimulationManualProjectVO> pageInfo = new PageInfo<>(vos);
 
@@ -210,7 +210,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if (isEmpty(param.getId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
         }
-        SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
+        SimulationManualProjectPO po = simulationManualProjectMapper.selectProjectById(param);
         if (po == null) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "没有获取到数据。");
         }
@@ -241,14 +241,14 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         String[] idArr = ids.split(",");
 
         // 仅有执行中的不能删除
-        List<SimulationManualProjectPO> pos = simulationProjectMapper.selectProjectNowRunState(idArr);
+        List<SimulationManualProjectPO> pos = simulationManualProjectMapper.selectProjectNowRunState(idArr);
         for (SimulationManualProjectPO p : pos) {
             if (ProjectRunStateEnum.EXECUTION.getCode().equals(p.getNowRunState())) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "数据不支持删除。");
             }
         }
 
-        int i = simulationProjectMapper.deleteProject(idArr);
+        int i = simulationManualProjectMapper.deleteProject(idArr);
         if (i > 0) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         }
@@ -279,7 +279,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             projectDetailsVO.setNowRunStateName(DictConstants.PROJECT_TERMINATED_NAME);
             String projectDetailsVOJson = JsonUtil.beanToJson(projectDetailsVO);
             oldProjectPO.setDetails(projectDetailsVOJson);
-            simulationProjectMapper.updateDetailsAndNowRunStateById(oldProjectId, projectDetailsVOJson, DictConstants.PROJECT_TERMINATED);
+            simulationManualProjectMapper.updateDetailsAndNowRunStateById(oldProjectId, projectDetailsVOJson, DictConstants.PROJECT_TERMINATED);
             projectStopToKafka(oldProjectPO);
         } else if (DictConstants.PROJECT_RUNNING.equals(newState)) {
             projectDetailsVO.setNowRunState(DictConstants.PROJECT_RUNNING);
@@ -299,18 +299,18 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 newProjectPO.setFinishTime(null);
                 String projectDetailsVOJson = JsonUtil.beanToJson(projectDetailsVO);
                 newProjectPO.setDetails(projectDetailsVOJson);
-                simulationProjectMapper.add(newProjectPO);
+                simulationManualProjectMapper.add(newProjectPO);
                 projectRunToKafka(newProjectPO);
             } else if (DictConstants.PROJECT_TERMINATED.equals(oldState)) { //重新运行被终止的项目需要修改新的ID
                 // 如果是重新运行的项目，修改项目ID
                 String newProjectId = StringUtil.getRandomUUID();
                 oldProjectPO.setId(newProjectId);
                 String projectDetailsVOJson = JsonUtil.beanToJson(projectDetailsVO);
-                simulationProjectMapper.updateIdAndDetailsAndNowRunStateById(oldProjectId, newProjectId, projectDetailsVOJson, DictConstants.PROJECT_RUNNING);
+                simulationManualProjectMapper.updateIdAndDetailsAndNowRunStateById(oldProjectId, newProjectId, projectDetailsVOJson, DictConstants.PROJECT_RUNNING);
                 projectRunToKafka(oldProjectPO);
             } else if (DictConstants.PROJECT_WAITING.equals(oldState)) { // 启动已保存的新项目
                 String projectDetailsVOJson = JsonUtil.beanToJson(projectDetailsVO);
-                simulationProjectMapper.updateDetailsAndNowRunStateById(oldProjectId, projectDetailsVOJson, DictConstants.PROJECT_RUNNING);
+                simulationManualProjectMapper.updateDetailsAndNowRunStateById(oldProjectId, projectDetailsVOJson, DictConstants.PROJECT_RUNNING);
                 projectRunToKafka(oldProjectPO);
             } else {
                 throw new RuntimeException("未知项目状态:" + oldState);
@@ -400,7 +400,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         final String projectType = param.getProjectType();
         String details;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) { // 手动运行任务
-            SimulationManualProjectPO simulationManualProjectPO = simulationProjectMapper.selectProjectById(param);
+            SimulationManualProjectPO simulationManualProjectPO = simulationManualProjectMapper.selectProjectById(param);
             details = simulationManualProjectPO.getDetails();
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
             SimulationManualProjectVO simulationManualProjectVO = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
@@ -416,14 +416,14 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         ProjectTaskParam projectTaskParam = new ProjectTaskParam();
         projectTaskParam.setPId(param.getId());
         List<ProjectRunResultRatioNumVo> projectRunResultRatioNumVos = null;
-        Integer size = simulationProjectTaskMapper.selectProjectTaskNumByProjectId(projectTaskParam);
+        Integer size = simulationManualProjectTaskMapper.selectProjectTaskNumByProjectId(projectTaskParam);
         if (size > 0) {
-            states = simulationProjectTaskMapper.selectRunStateCount(param.getId());
+            states = simulationManualProjectTaskMapper.selectRunStateCount(param.getId());
             taskRunState(states, size);
-            projectRunResultRatioNumVos = simulationProjectTaskMapper.selectRunResultCount(param.getId());
+            projectRunResultRatioNumVos = simulationManualProjectTaskMapper.selectRunResultCount(param.getId());
             taskResultState(projectRunResultRatioNumVos, size);
 
-            resultScoreList = simulationProjectTaskMapper.selectScoreCount(param.getId());
+            resultScoreList = simulationManualProjectTaskMapper.selectScoreCount(param.getId());
 
             // 未完成得分为”“的改为0
             if (!isEmpty(resultScoreList) && resultScoreList.size() == 1 && isEmpty(resultScoreList.get(0).getResultName())) {
@@ -476,7 +476,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         ProjectDetailsVO projectDetailsVO = null;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(param.getProjectType())) { // 手动运行任务
-            SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
+            SimulationManualProjectPO po = simulationManualProjectMapper.selectProjectById(param);
             projectDetailsVO = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVO.class);
             projectDetailsVO.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
             projectDetailsVO.setStartTime(getRqStr(po.getStartTime(), 1));
@@ -503,14 +503,14 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         ProjectTaskParam projectTaskParam = new ProjectTaskParam();
         projectTaskParam.setPId(param.getId());
         List<ProjectRunResultRatioNumVo> projectRunResultRatioNumVos = null;
-        Integer size = simulationProjectTaskMapper.selectProjectTaskNumByProjectId(projectTaskParam);
+        Integer size = simulationManualProjectTaskMapper.selectProjectTaskNumByProjectId(projectTaskParam);
         if (size > 0) {
-            states = simulationProjectTaskMapper.selectRunStateCount(param.getId());
+            states = simulationManualProjectTaskMapper.selectRunStateCount(param.getId());
             taskRunState(states, size);
-            projectRunResultRatioNumVos = simulationProjectTaskMapper.selectRunResultCount(param.getId());
+            projectRunResultRatioNumVos = simulationManualProjectTaskMapper.selectRunResultCount(param.getId());
             taskResultState(projectRunResultRatioNumVos, size);
 
-            resultScoreList = simulationProjectTaskMapper.selectScoreCount(param.getId());
+            resultScoreList = simulationManualProjectTaskMapper.selectScoreCount(param.getId());
 
             // 未完成得分为”“的改为0
             if (!isEmpty(resultScoreList) && resultScoreList.size() == 1 && isEmpty(resultScoreList.get(0).getResultName())) {
@@ -573,7 +573,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(param.getProjectType())) { // 手动运行任务
             // 项目基本信息
-            SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
+            SimulationManualProjectPO po = simulationManualProjectMapper.selectProjectById(param);
             if (po == null) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "没有获取到数据");
             }
@@ -588,7 +588,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
 
         // 获取场景包信息
-        ScenePackagePO scenePackagePO = simulationProjectMapper.selectScenePackageInfoById(projectPO.getScene());
+        ScenePackagePO scenePackagePO = simulationManualProjectMapper.selectScenePackageInfoById(projectPO.getScene());
 
         projectDetailsVO.setPackageName(scenePackagePO.getPackageName());
 
@@ -604,10 +604,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         ConfigPO configPO = new ConfigPO();
         configPO.setId(vehicleConfigId);
-        List<ConfigPO> configVehicleVOS = simulationProjectMapper.selectConfigVehicle(configPO);
+        List<ConfigPO> configVehicleVOS = simulationManualProjectMapper.selectConfigVehicle(configPO);
         if (!isEmpty(configVehicleVOS)) {
             ConfigPO configVehicleVO = configVehicleVOS.get(0);
-            List<VehiclePO> vehiclePOS = simulationProjectMapper.selectVehicleBaseInfoById(configVehicleVO.getVehicleId());
+            List<VehiclePO> vehiclePOS = simulationManualProjectMapper.selectVehicleBaseInfoById(configVehicleVO.getVehicleId());
             if (!isEmpty(vehiclePOS)) {
                 vehicleBaseInfoVo = vehiclePOS.get(0);
             }
@@ -621,7 +621,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
          * }
          */
 
-        List<ConfigSensorPO> vehicleSensorVos = simulationProjectMapper.selectVehicleSensor(vehicleConfigId);
+        List<ConfigSensorPO> vehicleSensorVos = simulationManualProjectMapper.selectVehicleSensor(vehicleConfigId);
 
         List<SensorBaseInfoVo> sensorCameraList = new ArrayList<>();
         List<SensorBaseInfoVo> sensorOgtList = new ArrayList<>();
@@ -633,7 +633,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             String sensorId = vs.getSensorId();
             if (DictConstants.SENSOR_CAMERA.equals(sensorType)) {
                 // 摄像头
-                SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorCamera(sensorId);
+                SensorBaseInfoVo sensorBaseInfoVo = simulationManualProjectMapper.selectSensorCamera(sensorId);
                 if (ObjectUtil.isNotNull(sensorBaseInfoVo) && sensorBaseInfoVo.getShare().equals("0")) {
                     sensorBaseInfoVo.setSensorName("私有/" + sensorBaseInfoVo.getSensorName());
                 } else if (ObjectUtil.isNotNull(sensorBaseInfoVo) && sensorBaseInfoVo.getShare().equals("1")) {
@@ -643,7 +643,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 sensorCameraList.add(sensorBaseInfoVo);
             } else if (DictConstants.SENSOR_OGT.equals(sensorType)) {
                 // 完美传感器
-                SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorOgt(sensorId);
+                SensorBaseInfoVo sensorBaseInfoVo = simulationManualProjectMapper.selectSensorOgt(sensorId);
                 if (ObjectUtil.isNotNull(sensorBaseInfoVo) && sensorBaseInfoVo.getShare().equals("0")) {
                     sensorBaseInfoVo.setSensorName("私有/" + sensorBaseInfoVo.getSensorName());
                 } else if (ObjectUtil.isNotNull(sensorBaseInfoVo) && sensorBaseInfoVo.getShare().equals("1")) {
@@ -653,7 +653,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 sensorOgtList.add(sensorBaseInfoVo);
             } else if (DictConstants.SENSOR_LIDAR.equals(sensorType)) {
                 // 激光雷达
-                SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorLidar(sensorId);
+                SensorBaseInfoVo sensorBaseInfoVo = simulationManualProjectMapper.selectSensorLidar(sensorId);
                 if (ObjectUtil.isNotNull(sensorBaseInfoVo) && sensorBaseInfoVo.getShare().equals("0")) {
                     sensorBaseInfoVo.setSensorName("私有/" + sensorBaseInfoVo.getSensorName());
                 } else if (ObjectUtil.isNotNull(sensorBaseInfoVo) && sensorBaseInfoVo.getShare().equals("1")) {
@@ -663,7 +663,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 sensorLidarList.add(sensorBaseInfoVo);
             } else if (DictConstants.SENSOR_RADAR.equals(sensorType)) {
                 // 毫米波雷达
-                SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorRadar(sensorId);
+                SensorBaseInfoVo sensorBaseInfoVo = simulationManualProjectMapper.selectSensorRadar(sensorId);
                 if (ObjectUtil.isNotNull(sensorBaseInfoVo) && sensorBaseInfoVo.getShare().equals("0")) {
                     sensorBaseInfoVo.setSensorName("私有/" + sensorBaseInfoVo.getSensorName());
                 } else if (ObjectUtil.isNotNull(sensorBaseInfoVo) && sensorBaseInfoVo.getShare().equals("1")) {
@@ -673,7 +673,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 sensorRadarList.add(sensorBaseInfoVo);
             } else if (DictConstants.SENSOR_GPS.equals(sensorType)) {
                 // gps
-                SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorGps(sensorId);
+                SensorBaseInfoVo sensorBaseInfoVo = simulationManualProjectMapper.selectSensorGps(sensorId);
                 setVehicleConfig(sensorBaseInfoVo, vs);
                 sensorGpsList.add(sensorBaseInfoVo);
             }
@@ -842,7 +842,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         final String id = param.getId();
         ProjectReportVO projectReportVO;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            final String projectReportVOJson = simulationProjectMapper.selectReportById(id);
+            final String projectReportVOJson = simulationManualProjectMapper.selectReportById(id);
             projectReportVO = JsonUtil.jsonToBean(projectReportVOJson, ProjectReportVO.class);
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
             final String projectReportVOJson = simulationAutomaticSubProjectMapper.selectReportById(id);
@@ -861,7 +861,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
             // 项目基本信息
-            projectPO = simulationProjectMapper.selectProjectBaseById(param);
+            projectPO = simulationManualProjectMapper.selectProjectBaseById(param);
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
             SimulationManualProjectVO po = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
             BeanUtils.copyProperties(po, projectPO);
@@ -999,9 +999,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 algorithmBaseInfoVo.setAlgorithmName(dropDownVo.getName());
                 algorithmBaseInfoVo.setDescription(dropDownVo.getDescription());
             }
-
         } else {
-            algorithmBaseInfoVo = simulationProjectMapper.selectAlgorithmById(algorithmId);
+            algorithmBaseInfoVo = simulationManualProjectMapper.selectAlgorithmInfoById(algorithmId);
         }
         return algorithmBaseInfoVo;
     }
@@ -1069,7 +1068,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         ProjectTaskParam projectTaskParam = new ProjectTaskParam();
         projectTaskParam.setPId(id);
         projectTaskParam.setId(taskId);
-        List<ManualProjectTaskPO> pos = simulationProjectTaskMapper.selectProjectTask(projectTaskParam);
+        List<ManualProjectTaskPO> pos = simulationManualProjectTaskMapper.selectProjectTask(projectTaskParam);
         if (CollectionUtil.isEmpty(pos)) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "没有获取到任务信息。");
         }
@@ -1087,7 +1086,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // -------------------------------- 获取任务得分详情 --------------------------------
         SimulationManualProjectPO projectPO = new SimulationManualProjectPO();
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            SimulationManualProjectPO spo = simulationProjectMapper.selectProjectBaseById(param);
+            SimulationManualProjectPO spo = simulationManualProjectMapper.selectProjectBaseById(param);
             Optional.ofNullable(spo).orElseThrow(() -> new RuntimeException("没有获取到数据。"));
             projectPO = spo;
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
@@ -1414,7 +1413,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         ProjectTaskParam projectTaskParam = new ProjectTaskParam();
         projectTaskParam.setPId(param.getId());
         setPage(param.getCurrentPage() == null ? 1 : param.getCurrentPage(), param.getPageSize() == null ? 10 : param.getPageSize());
-        List<ManualProjectTaskVo> tasks = simulationProjectTaskMapper.selectProjectTaskByProjectId(projectTaskParam);
+        List<ManualProjectTaskVo> tasks = simulationManualProjectTaskMapper.selectProjectTaskByProjectId(projectTaskParam);
         tasks.forEach(task -> {
             if (StateConstant.Aborted.getEnglish().equals(task.getRunState())) {
                 task.setRunState(StateConstant.Aborted.getChinese());
@@ -1485,22 +1484,22 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     private SceneBaseInfoVo getSceneNameAndOther(String sceneId, String sceneType) {
         SceneBaseInfoVo resultVo = new SceneBaseInfoVo();
         if (DictConstants.SCENE_NATURAL.equals(sceneType)) {
-            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneNatural(sceneId);
+            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneNatural(sceneId);
             if (sceneBaseInfoVo != null) {
                 resultVo.setCommonSceneName(sceneBaseInfoVo.getNaturalName());
             }
         } else if (DictConstants.SCENE_STANDARD.equals(sceneType)) {
-            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneStandardsRegulations(sceneId);
+            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneStandardsRegulations(sceneId);
             if (sceneBaseInfoVo != null) {
                 resultVo.setCommonSceneName(sceneBaseInfoVo.getSceneName());
             }
         } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
-            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneAccidentById(sceneId);
+            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneAccidentById(sceneId);
             if (sceneBaseInfoVo != null) {
                 resultVo.setCommonSceneName(sceneBaseInfoVo.getSceneName());
             }
         } else if (DictConstants.SCENE_GENERAL.equals(sceneType)) {
-            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneGeneralDataById(sceneId);
+            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneGeneralDataById(sceneId);
             if (sceneBaseInfoVo != null) {
                 resultVo.setCommonSceneName(sceneBaseInfoVo.getSceneName());
             }
@@ -1524,7 +1523,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             } else {
                 algorithmPO.setUploadMode(algorithmType);
             }
-            List<AlgorithmPO> algorithmBaseInfoVo = simulationProjectMapper.selectAlgorithmBaseInfoById(algorithmPO);
+            List<AlgorithmPO> algorithmBaseInfoVo = simulationManualProjectMapper.selectAlgorithmBaseInfoById(algorithmPO);
 
             for (AlgorithmPO v : algorithmBaseInfoVo) {
                 DropDownVo dropDownVo = new DropDownVo();
@@ -1604,7 +1603,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             configPO.setId(ConfigId);
         }
         configPO.setCreateUserId(AuthUtil.getCurrentUserId());
-        List<ConfigPO> vehicleBaseInfoVo = simulationProjectMapper.selectConfigVehicle2(configPO);
+        List<ConfigPO> vehicleBaseInfoVo = simulationManualProjectMapper.selectConfigVehicle2(configPO);
         List<DropDownVo> vehicleList = new ArrayList<>();
         for (ConfigPO v : vehicleBaseInfoVo) {
             DropDownVo dropDownVo = new DropDownVo();
@@ -1613,7 +1612,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             dropDownVo.setDescription(v.getDescription());
             dropDownVo.setShare(v.getShare());
             // 获取传感器信息
-            List<ConfigSensorPO> configSensorVos = simulationProjectMapper.selectConfigSensor(v.getId());
+            List<ConfigSensorPO> configSensorVos = simulationManualProjectMapper.selectConfigSensor(v.getId());
             String sensor = "";
             if (!isEmpty(configSensorVos) && configSensorVos.get(0) != null) {
                 StringBuilder stringBuilder = new StringBuilder();
@@ -1637,7 +1636,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     private void setScenePackageDropDown(List<DropDownTypeVo> result) {
         ScenePackagePO scenePackagePO = new ScenePackagePO();
         scenePackagePO.setCreateUserId(AuthUtil.getCurrentUserId());
-        List<ScenePackagePO> scenePackageBaseVo = simulationProjectMapper.selectScenePackageBaseById(scenePackagePO);
+        List<ScenePackagePO> scenePackageBaseVo = simulationManualProjectMapper.selectScenePackageBaseById(scenePackagePO);
         List<DropDownVo> scenePackageList = new ArrayList<>();
         for (ScenePackagePO v : scenePackageBaseVo) {
             DropDownVo dropDownVo = new DropDownVo();
@@ -1694,7 +1693,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 algorithmName = "算法平台已删除该算法";
             }
         } else {
-            AlgorithmPO algorithmPO = simulationProjectMapper.selectAlgorithmById(algorithmId);
+            AlgorithmPO algorithmPO = simulationManualProjectMapper.selectAlgorithmInfoById(algorithmId);
             if (algorithmPO != null && StringUtil.isNotEmpty(algorithmPO.getAlgorithmName())) {
                 algorithmName = algorithmPO.getAlgorithmName();
             } else {
@@ -1731,7 +1730,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     private void createProjectId(SimulationManualProjectPO po) {
         Integer nowRq = getRq(null, 0);
         po.setProjectDate(nowRq);
-        SimulationManualProjectPO po1 = simulationProjectMapper.selectLastProjectId(nowRq);
+        SimulationManualProjectPO po1 = simulationManualProjectMapper.selectLastProjectId(nowRq);
         if (po1 == null) {
             // 生成新id
             po.setProjectNum(1);
@@ -1825,25 +1824,25 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         SceneBaseInfoVo sceneBaseInfoVo;
         if (DictConstants.SCENE_NATURAL.equals(sceneType)) {
             // 自然驾驶
-            sceneBaseInfoVo = simulationProjectMapper.selectSceneNatural(sceneId);
+            sceneBaseInfoVo = simulationManualProjectMapper.selectSceneNatural(sceneId);
             if (sceneBaseInfoVo != null) {
                 vo.setSceneName(sceneBaseInfoVo.getNaturalName());
             }
         } else if (DictConstants.SCENE_STANDARD.equals(sceneType)) {
             // 标准法规
-            sceneBaseInfoVo = simulationProjectMapper.selectSceneStandardsRegulations(sceneId);
+            sceneBaseInfoVo = simulationManualProjectMapper.selectSceneStandardsRegulations(sceneId);
             if (sceneBaseInfoVo != null) {
                 vo.setSceneName(sceneBaseInfoVo.getSceneName());
             }
         } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
             // 交通事故
-            sceneBaseInfoVo = simulationProjectMapper.selectSceneAccidentById(sceneId);
+            sceneBaseInfoVo = simulationManualProjectMapper.selectSceneAccidentById(sceneId);
             if (sceneBaseInfoVo != null) {
                 vo.setSceneName(sceneBaseInfoVo.getSceneName());
             }
         } else if (DictConstants.SCENE_GENERAL.equals(sceneType)) {
             /// TODO 泛化场景暂不支持
-            sceneBaseInfoVo = simulationProjectMapper.selectSceneGeneralDataById(sceneId);
+            sceneBaseInfoVo = simulationManualProjectMapper.selectSceneGeneralDataById(sceneId);
             if (sceneBaseInfoVo != null) {
                 vo.setSceneName(sceneBaseInfoVo.getSceneName());
             }
@@ -1879,7 +1878,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         if (isRoot) {
             // 查找一级节点
-            parentVoList = simulationProjectMapper.selectSubSceneByPid(scenePackageId);
+            parentVoList = simulationManualProjectMapper.selectSubSceneByPid(scenePackageId);
             if (!isEmpty(parentVoList)) {
                 selectScenePackageSubListTreeAndSetScore(parentVoList, false, null, pId, level);
             }
@@ -1896,7 +1895,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                     setFirstTargetScore(pvo, pId);
                 }
 
-                List<ScenePackageSubListVO> cvoList = simulationProjectMapper.selectSubSceneByPid(pvo.getSublistId());
+                List<ScenePackageSubListVO> cvoList = simulationManualProjectMapper.selectSubSceneByPid(pvo.getSublistId());
                 if (!isEmpty(cvoList)) {
                     // 存入父节点集合中
                     pvo.setChildScenePackageSubListVOList(cvoList);
@@ -1920,14 +1919,14 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         SimulationManualProjectParam query = new SimulationManualProjectParam();
         query.setId(projectId);
         query.setPackageId(scenePackageId);
-        List<SublistScoreVo> pos = simulationProjectMapper.selectSubScore2(query);
+        List<SublistScoreVo> pos = simulationManualProjectMapper.selectSubScore2(query);
         // 2 查询指定项目的所有任务得分结果
         ProjectTaskParam param = new ProjectTaskParam();
         param.setPId(projectId);
         if (!isEmpty(taskId)) {
             param.setTaskId(taskId);
         }
-        List<ManualProjectTaskVo> taskList = simulationProjectTaskMapper.selectProjectTaskByProjectId(param); // 手动运行项目和自动运行项目使用同一个任务表
+        List<ManualProjectTaskVo> taskList = simulationManualProjectTaskMapper.selectProjectTaskByProjectId(param); // 手动运行项目和自动运行项目使用同一个任务表
 
         // 2 拼接场景得分信息
         List<SublistScoreVo> lastSubList = new ArrayList<>();
@@ -1946,19 +1945,19 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                         String sceneName = "";
                         if (DictConstants.SCENE_NATURAL.equals(sceneType)) {
                             sublistScoreVo.setSceneType("自然驾驶");
-                            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneNatural(sceneId);
+                            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneNatural(sceneId);
                             sceneName = sceneBaseInfoVo.getNaturalName();
                         } else if (DictConstants.SCENE_STANDARD.equals(sceneType)) {
                             sublistScoreVo.setSceneType("标准法规");
-                            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneStandardsRegulations(sceneId);
+                            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneStandardsRegulations(sceneId);
                             sceneName = sceneBaseInfoVo.getSceneName();
                         } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
                             sublistScoreVo.setSceneType("交通事故");
-                            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneAccidentById(sceneId);
+                            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneAccidentById(sceneId);
                             sceneName = sceneBaseInfoVo.getSceneName();
                         } else if (DictConstants.SCENE_GENERAL.equals(sceneType)) {
                             sublistScoreVo.setSceneType("泛化");
-                            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneGeneralDataById(sceneId);
+                            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneGeneralDataById(sceneId);
                             sceneName = sceneBaseInfoVo.getSceneName();
                         }
                         sublistScoreVo.setReturnSceneId(sceneName); // 显示场景名称
@@ -2056,14 +2055,14 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         SimulationManualProjectParam query = new SimulationManualProjectParam();
         query.setId(projectId);
         query.setPackageId(scenePackageId);
-        List<SublistScoreVo> pos = simulationProjectMapper.selectSubScore2(query);
+        List<SublistScoreVo> pos = simulationManualProjectMapper.selectSubScore2(query);
         // 2 查询指定项目的所有任务得分结果
         ProjectTaskParam param = new ProjectTaskParam();
         param.setPId(projectId);
         if (!isEmpty(taskId)) {
             param.setTaskId(taskId);
         }
-        List<ManualProjectTaskVo> taskList = simulationProjectTaskMapper.selectProjectTaskByProjectId(param); // 手动运行项目和自动运行项目使用同一个任务表
+        List<ManualProjectTaskVo> taskList = simulationManualProjectTaskMapper.selectProjectTaskByProjectId(param); // 手动运行项目和自动运行项目使用同一个任务表
 
         // 2 拼接场景得分信息
         List<SublistScoreVo> lastSubList = new ArrayList<>();
@@ -2082,19 +2081,19 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                         String sceneName = "";
                         if (DictConstants.SCENE_NATURAL.equals(sceneType)) {
                             sublistScoreVo.setSceneType("自然驾驶");
-                            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneNatural(sceneId);
+                            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneNatural(sceneId);
                             sceneName = sceneBaseInfoVo.getNaturalName();
                         } else if (DictConstants.SCENE_STANDARD.equals(sceneType)) {
                             sublistScoreVo.setSceneType("标准法规");
-                            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneStandardsRegulations(sceneId);
+                            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneStandardsRegulations(sceneId);
                             sceneName = sceneBaseInfoVo.getSceneName();
                         } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
                             sublistScoreVo.setSceneType("交通事故");
-                            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneAccidentById(sceneId);
+                            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneAccidentById(sceneId);
                             sceneName = sceneBaseInfoVo.getSceneName();
                         } else if (DictConstants.SCENE_GENERAL.equals(sceneType)) {
                             sublistScoreVo.setSceneType("泛化");
-                            SceneBaseInfoVo sceneBaseInfoVo = simulationProjectMapper.selectSceneGeneralDataById(sceneId);
+                            SceneBaseInfoVo sceneBaseInfoVo = simulationManualProjectMapper.selectSceneGeneralDataById(sceneId);
                             sceneName = sceneBaseInfoVo.getSceneName();
                         }
                         sublistScoreVo.setReturnSceneId(sceneName); // 显示场景名称
@@ -2253,7 +2252,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         SimulationManualProjectParam query = new SimulationManualProjectParam();
         query.setId(projectId);
         query.setPackageId(scenePackageId);
-        List<SublistScoreVo> sublistScoreVoList = simulationProjectMapper.selectSubScore2(query);
+        List<SublistScoreVo> sublistScoreVoList = simulationManualProjectMapper.selectSubScore2(query);
         HashMap<String, Object> hashMap = new HashMap<>();
         int maxHeaderNumber = 0;
         List<List<String>> result = new ArrayList<>();
@@ -2574,7 +2573,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         sceneScoreParam.setLastTargerId(vo.getSublistId());
         sceneScoreParam.setSceneType(sceneType);
         sceneScoreParam.setSceneIds(Arrays.asList(sceneIdArr));
-        List<SceneScoreVo> sceneScoreVos = simulationProjectTaskMapper.selectSceneScoreByIds(sceneScoreParam);
+        List<SceneScoreVo> sceneScoreVos = simulationManualProjectTaskMapper.selectSceneScoreByIds(sceneScoreParam);
 
         for (SceneScoreVo s : sceneScoreVos) {
             /*
@@ -2637,7 +2636,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             resultVo.setNum(0);
 
             // 查找下一级指标
-            parentVoList = simulationProjectMapper.selectSubSceneByPid(sublistId);
+            parentVoList = simulationManualProjectMapper.selectSubSceneByPid(sublistId);
             if (!isEmpty(parentVoList)) {
                 selectScoreNum(resultVo, parentVoList, false, pId, null);
             } else {
@@ -2650,7 +2649,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             // 获取子节点集合
             for (ScenePackageSubListVO pvo : parentVoList) {
 
-                List<ScenePackageSubListVO> cvoList = simulationProjectMapper.selectSubSceneByPid(pvo.getSublistId());
+                List<ScenePackageSubListVO> cvoList = simulationManualProjectMapper.selectSubSceneByPid(pvo.getSublistId());
                 if (!isEmpty(cvoList)) {
                     // 存入父节点集合中
                     pvo.setChildScenePackageSubListVOList(cvoList);
@@ -2672,7 +2671,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         SimulationMptSceneScorePO po = new SimulationMptSceneScorePO();
         po.setPId(pId);
         po.setLastTargerId(sublistId);
-        SceneScoreVo sceneScoreVo = simulationProjectTaskMapper.selectSceneScoreNumQuery(po);
+        SceneScoreVo sceneScoreVo = simulationManualProjectTaskMapper.selectSceneScoreNumQuery(po);
         resultVo.setNum(resultVo.getNum() + sceneScoreVo.getNum());
     }
 
@@ -2685,7 +2684,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         /*
          * 汇总测试得分(计算评级)计算方法：（每一项一级指标的测试得分*测试权重）累加
          */
-        List<ScenePackageSubListVO> scenePackageSubListVOS = simulationProjectMapper.selectSubSceneByPid(po.getScene());
+        List<ScenePackageSubListVO> scenePackageSubListVOS = simulationManualProjectMapper.selectSubSceneByPid(po.getScene());
 
         String evaluationLevelReport = "";
         if (!isEmpty(scenePackageSubListVOS)) {
@@ -2736,7 +2735,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         String key2 = "runState";
         Map<String, Object> params = new HashMap<>();
         params.put("createUserId", AuthUtil.getCurrentUserId());
-        List<Map<String, Object>> list = simulationProjectTaskMapper.selectRunTaskByState(params);
+        List<Map<String, Object>> list = simulationManualProjectTaskMapper.selectRunTaskByState(params);
         // 汉化
         if (CollectionUtil.isNotEmpty(list)) {
             list.forEach(map -> {
@@ -2789,7 +2788,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         Map<String, Object> params = new HashMap<>();
         params.put("createUserId", AuthUtil.getCurrentUserId());
         // 10：未执行，20：执行中，30：执行完成，40：已中止
-        List<Map<String, Object>> list = simulationProjectMapper.selectRunProjectByState(params);
+        List<Map<String, Object>> list = simulationManualProjectMapper.selectRunProjectByState(params);
         if (list != null && list.size() > 0) {
             for (Map<String, Object> map : list) {
                 String nowRunState = map.get("nowRunState").toString();
@@ -2805,7 +2804,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         String key2 = "evaluationLevel";
         Map<String, Object> params = new HashMap<>();
         params.put("createUserId", AuthUtil.getCurrentUserId());
-        final List<Map<String, Object>> maps = simulationProjectMapper.selectEvaluationLevel(params);
+        final List<Map<String, Object>> maps = simulationManualProjectMapper.selectEvaluationLevel(params);
         final Iterator<Map<String, Object>> iterator = maps.iterator();
         while (iterator.hasNext()) {
             final Map<String, Object> map = iterator.next();
@@ -4026,7 +4025,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     @Override
     public String selectLastProjectIdByAlgorithmId(String algorithmId) {
-        return simulationProjectMapper.selectLastProjectIdByAlgorithmId(algorithmId);
+        return simulationManualProjectMapper.selectLastProjectIdByAlgorithmId(algorithmId);
     }
 
     @Override
@@ -4368,7 +4367,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 manualProjectTaskPo.setTimerShaft(s);
             }
 
-            simulationProjectTaskMapper.updateTaksResult(manualProjectTaskPo);
+            simulationManualProjectTaskMapper.updateTaksResult(manualProjectTaskPo);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -4405,7 +4404,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // 获取任务包信息
         ProjectTaskParam projectTaskParam = new ProjectTaskParam();
         projectTaskParam.setPId(id);
-        List<ManualProjectTaskVo> manualProjectTaskVos = simulationProjectTaskMapper.selectProjectTaskByProjectId(projectTaskParam);
+        List<ManualProjectTaskVo> manualProjectTaskVos = simulationManualProjectTaskMapper.selectProjectTaskByProjectId(projectTaskParam);
         if (isEmpty(manualProjectTaskVos)) {
             throw new RuntimeException("没有获取到任务信息。");
         }
@@ -4413,7 +4412,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // 压缩包根路径
         SimulationManualProjectParam sp = new SimulationManualProjectParam();
         sp.setId(id);
-        SimulationManualProjectPO spo = simulationProjectMapper.selectProjectBaseById(sp);
+        SimulationManualProjectPO spo = simulationManualProjectMapper.selectProjectBaseById(sp);
         String rootPath = spo.getProjectName();
         // FileUtil.createDirectory(rootPath);
 
@@ -4505,7 +4504,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             // 打包pdf
             if (param.getIsPagePdf() != null && param.getIsPagePdf()) {
                 // 获取工作信息
-                SimulationManualProjectPO p = simulationProjectMapper.selectProjectBaseById(param);
+                SimulationManualProjectPO p = simulationManualProjectMapper.selectProjectBaseById(param);
                 final String algorithmName = algorithmMapper.selectAlgorithmNameByAlgorithmId(param.getAlgorithm());
 
                 pdfFile = new File(param.getLocalPdfFilePath());
@@ -5123,12 +5122,12 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             po.setAlgorithmName(param.getAlgorithmName());
             po.setUploadMode(DictConstants.PLATFORM);
             po.setIsDeleted("0");
-            AlgorithmPO po1 = simulationProjectMapper.selectAlgorithmByQuery(po);
+            AlgorithmPO po1 = simulationManualProjectMapper.selectAlgorithmByQuery(po);
             if (po1 == null) {
-                simulationProjectMapper.insertOtherAlgorithm(po);
+                simulationManualProjectMapper.insertOtherAlgorithm(po);
             } else {
                 if (!po1.getAlgorithmName().equals(param.getAlgorithmName())) {
-                    simulationProjectMapper.updateOtherAlgorithm(po);
+                    simulationManualProjectMapper.updateOtherAlgorithm(po);
                 }
             }
 
@@ -5243,7 +5242,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             } else {
                 algorithmPO.setUploadMode(algorithmType);
             }
-            List<AlgorithmPO> algorithmBaseInfoSyVo = simulationProjectMapper.selectAlgorithmBaseInfoByIdSy(algorithmPO);
+            List<AlgorithmPO> algorithmBaseInfoSyVo = simulationManualProjectMapper.selectAlgorithmBaseInfoByIdSy(algorithmPO);
 
             for (AlgorithmPO v : algorithmBaseInfoSyVo) {
                 DropDownVo dropDownVo = new DropDownVo();
@@ -5253,7 +5252,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 dropDownVo.setShare(v.getShare());
                 algorithmListSy.add(dropDownVo);
             }
-            List<AlgorithmPO> algorithmBaseInfoGyVo = simulationProjectMapper.selectAlgorithmBaseInfoByIdGy(algorithmPO);
+            List<AlgorithmPO> algorithmBaseInfoGyVo = simulationManualProjectMapper.selectAlgorithmBaseInfoByIdGy(algorithmPO);
 
             for (AlgorithmPO v : algorithmBaseInfoGyVo) {
                 DropDownVo dropDownVo = new DropDownVo();
@@ -5322,7 +5321,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         List<Map> treeList = new ArrayList<>();
         ConfigPO configPO = new ConfigPO();
         configPO.setCreateUserId(AuthUtil.getCurrentUserId());
-        List<ConfigPO> vehicleBaseInfoSyVo = simulationProjectMapper.selectConfigVehicleSy(configPO);
+        List<ConfigPO> vehicleBaseInfoSyVo = simulationManualProjectMapper.selectConfigVehicleSy(configPO);
         List<DropDownVo> vehicleSyList = new ArrayList<>();
         for (ConfigPO v : vehicleBaseInfoSyVo) {
             DropDownVo dropDownVo = new DropDownVo();
@@ -5331,7 +5330,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             dropDownVo.setDescription(v.getDescription());
             dropDownVo.setShare(v.getShare());
             // 获取传感器信息
-            List<ConfigSensorPO> configSensorVos = simulationProjectMapper.selectConfigSensor(v.getId());
+            List<ConfigSensorPO> configSensorVos = simulationManualProjectMapper.selectConfigSensor(v.getId());
             String sensor = "";
             if (!isEmpty(configSensorVos) && configSensorVos.get(0) != null) {
                 StringBuilder stringBuilder = new StringBuilder();
@@ -5346,7 +5345,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             vehicleSyList.add(dropDownVo);
         }
 
-        List<ConfigPO> vehicleBaseInfoGyVo = simulationProjectMapper.selectConfigVehicleGy(configPO);
+        List<ConfigPO> vehicleBaseInfoGyVo = simulationManualProjectMapper.selectConfigVehicleGy(configPO);
         List<DropDownVo> vehicleGyList = new ArrayList<>();
         for (ConfigPO v : vehicleBaseInfoGyVo) {
             DropDownVo dropDownVo = new DropDownVo();
@@ -5355,7 +5354,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             dropDownVo.setDescription(v.getDescription());
             dropDownVo.setShare(v.getShare());
             // 获取传感器信息
-            List<ConfigSensorPO> configSensorVos = simulationProjectMapper.selectConfigSensor(v.getId());
+            List<ConfigSensorPO> configSensorVos = simulationManualProjectMapper.selectConfigSensor(v.getId());
             String sensor = "";
             if (!isEmpty(configSensorVos) && configSensorVos.get(0) != null) {
                 StringBuilder stringBuilder = new StringBuilder();
@@ -5417,7 +5416,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         List<Map> treeList = new ArrayList<>();
         ScenePackagePO scenePackagePO = new ScenePackagePO();
         scenePackagePO.setCreateUserId(AuthUtil.getCurrentUserId());
-        List<ScenePackagePO> scenePackageBaseSyVo = simulationProjectMapper.selectScenePackageBaseByIdSy(scenePackagePO);
+        List<ScenePackagePO> scenePackageBaseSyVo = simulationManualProjectMapper.selectScenePackageBaseByIdSy(scenePackagePO);
         List<DropDownVo> scenePackageSyList = new ArrayList<>();
         for (ScenePackagePO v : scenePackageBaseSyVo) {
             DropDownVo dropDownVo = new DropDownVo();
@@ -5427,7 +5426,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             dropDownVo.setShare(v.getShare());
             scenePackageSyList.add(dropDownVo);
         }
-        List<ScenePackagePO> scenePackageBaseGyVo = simulationProjectMapper.selectScenePackageBaseByIdGy(scenePackagePO);
+        List<ScenePackagePO> scenePackageBaseGyVo = simulationManualProjectMapper.selectScenePackageBaseByIdGy(scenePackagePO);
         List<DropDownVo> scenePackageGyList = new ArrayList<>();
         for (ScenePackagePO v : scenePackageBaseGyVo) {
             DropDownVo dropDownVo = new DropDownVo();

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/CameraService.java

@@ -10,8 +10,8 @@ import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.CameraMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.CameraMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ClusterService.java

@@ -10,7 +10,7 @@ import api.common.util.StringUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ClusterMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ClusterMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ConfigService.java

@@ -7,10 +7,10 @@ import api.common.pojo.vo.model.*;
 import api.common.util.*;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ConfigMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.RelationConfigSensorMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.VehicleMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ConfigMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.RelationConfigSensorMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.VehicleMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.buf.StringUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/DictService.java

@@ -6,8 +6,8 @@ import api.common.pojo.param.system.DictParam;
 import api.common.pojo.vo.system.DictVO;
 import api.common.util.JsonUtil;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.acl.feign.RedisService;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.DictMapper;
+import com.css.simulation.resource.server.acl.RedisService;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.DictMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/GpsService.java

@@ -11,8 +11,8 @@ import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.GpsMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.GpsMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/HomePageService.java

@@ -12,11 +12,11 @@ import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
-import com.css.simulation.resource.server.acl.feign.OauthClientService;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.HomePageMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.LogMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SimulationProjectTaskMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserMapper;
+import com.css.simulation.resource.server.acl.OauthClientService;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.HomePageMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.LogMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SimulationManualProjectTaskMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemUserMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -35,7 +35,7 @@ public class HomePageService {
     @Resource
     private HomePageMapper homePageMapper;
     @Resource
-    private SimulationProjectTaskMapper simulationProjectTaskMapper;
+    private SimulationManualProjectTaskMapper simulationManualProjectTaskMapper;
     @Resource
     private SystemUserMapper systemUserMapper;
 
@@ -84,7 +84,7 @@ public class HomePageService {
         //* -------------------------------- 求动力学软件占用数量 --------------------------------
         //1 查询手动运行任务 -> 项目 -> 车辆配置 -> 车辆模型 -> 模型类型
         //2 查询自动运行任务 -> 子项目 -> 父项目 -> 车辆配置 -> 车辆模型 -> 模型类型
-        int dynamicsLicenseNumber = simulationProjectTaskMapper.selectTaskNumberOfCarsim();
+        int dynamicsLicenseNumber = simulationManualProjectTaskMapper.selectTaskNumberOfCarsim();
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, ServiceVO.builder()
                 .userNumber(systemUserMapper.selectCount())
                 .onlineNumber(onlineNumber)

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/LidarService.java

@@ -10,8 +10,8 @@ import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.LidarMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.LidarMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/LogService.java

@@ -21,9 +21,9 @@ import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.LogMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.VehicleTempMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.LogMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemUserMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.VehicleTempMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/MenuService.java

@@ -3,7 +3,7 @@ package com.css.simulation.resource.server.application.service;
 import api.common.pojo.vo.system.MenuVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.MenuMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.MenuMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/OgtService.java

@@ -11,8 +11,8 @@ import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.OgtMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.OgtMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ParameterService.java

@@ -10,7 +10,7 @@ import api.common.util.StringUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ParameterMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ParameterMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/RoleService.java

@@ -8,7 +8,7 @@ import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.RoleMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.RoleMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneAccidentService.java

@@ -11,11 +11,11 @@ import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneAccidentMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneAccidentMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneGeneralExampleService.java

@@ -9,10 +9,10 @@ import api.common.pojo.vo.scene.SceneGeneralTemplateMbVO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneGeneralDataMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneGeneralExampleMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneGeneralTemplateMapper;
-import com.css.simulation.resource.server.infrastructure.util.SceneUtil;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneGeneralDataMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneGeneralExampleMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneGeneralTemplateMapper;
+import com.css.simulation.resource.server.infrastructure.common.util.SceneUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneGeneralTemplateService.java

@@ -14,10 +14,10 @@ import api.common.pojo.vo.scene.SceneGeneralTemplateMbVO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneGeneralTemplateMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneGeneralTemplateMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneImportService.java

@@ -12,7 +12,7 @@ import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneImportMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneImportMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneNaturalService.java

@@ -11,12 +11,12 @@ import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneNaturalMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneNaturalMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.util.StringUtil;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ScenePackageService.java

@@ -8,8 +8,8 @@ import api.common.pojo.vo.scene.ScenePackageNewVO;
 import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.*;
-import com.css.simulation.resource.server.infrastructure.util.SceneUtil;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.*;
+import com.css.simulation.resource.server.infrastructure.common.util.SceneUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.buf.StringUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneStandardsService.java

@@ -11,11 +11,11 @@ import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneStandardsRegulationsMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneStandardsRegulationsMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ScoringRulesService.java

@@ -6,8 +6,8 @@ import api.common.util.LogUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScoringRulesMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScoringRulesMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SystemScenePackageService.java

@@ -13,7 +13,7 @@ import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.*;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.*;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -38,11 +38,11 @@ public class SystemScenePackageService {
     @Resource
     private LogService logService;
     @Resource
-    private  SceneAccidentMapper sceneAccidentMapper;
+    private SceneAccidentMapper sceneAccidentMapper;
     @Resource
-    private  SceneGeneralTemplateMapper sceneGeneralTemplateMapper;
+    private SceneGeneralTemplateMapper sceneGeneralTemplateMapper;
     @Resource
-    private  SceneNaturalMapper sceneNaturalMapper;
+    private SceneNaturalMapper sceneNaturalMapper;
     @Resource
     private  SceneStandardsRegulationsMapper sceneStandardsRegulationsMapper;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SystemUserSceneService.java

@@ -4,7 +4,7 @@ package com.css.simulation.resource.server.application.service;
 import api.common.pojo.po.scene.SystemUserScenePO;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserSceneMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemUserSceneMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/UserService.java

@@ -16,7 +16,7 @@ import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
 import com.css.simulation.resource.server.infrastructure.common.configuration.sms.SmsConfiguration;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemUserMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import org.springframework.kafka.core.KafkaTemplate;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/VehicleService.java

@@ -8,10 +8,10 @@ import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.VehicleMapper;
-import com.css.simulation.resource.server.infrastructure.util.VehicleUtil;
+import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.VehicleMapper;
+import com.css.simulation.resource.server.infrastructure.common.util.VehicleUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/VehicleTempService.java

@@ -11,9 +11,9 @@ import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.VehicleMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.VehicleTempMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.DictMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.VehicleMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.VehicleTempMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.DictMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/job_manage/JobManageApplication.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/job_manage/JobManageApplicationService.java

@@ -10,7 +10,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class JobManageApplication {
+public class JobManageApplicationService {
 
     @Resource
     private ProjectDomainService projectDomainService;

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

@@ -3,13 +3,17 @@ package com.css.simulation.resource.server.domain.service;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.MinioParameter;
+import api.common.pojo.param.algorithm.AlgorithmParameter;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.po.project.SimulationManualProjectPO;
+import api.common.pojo.vo.algorithm.AlgorithmVO;
 import api.common.pojo.vo.project.ProjectReportVO;
-import com.css.simulation.resource.server.acl.feign.FileDownService;
+import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.application.service.SimulationProjectService;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SimulationProjectMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SimulationProjectTaskMapper;
+import com.css.simulation.resource.server.infrastructure.db.entity.SimulationAutomaticProjectEntity;
+import com.css.simulation.resource.server.infrastructure.db.entity.SimulationAutomaticSubprojectEntity;
+import com.css.simulation.resource.server.infrastructure.db.entity.SimulationManualProjectEntity;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -21,18 +25,48 @@ public class ProjectDomainService {
     @Resource
     private SimulationProjectService simulationProjectService;
     @Resource
-    private SimulationProjectMapper simulationProjectMapper;
+    private SimulationManualProjectMapper simulationManualProjectMapper;
     @Resource
-    private SimulationProjectTaskMapper simulationProjectTaskMapper;
+    private SimulationAutomaticProjectMapper simulationAutomaticProjectMapper;
+    @Resource
+    private SimulationAutomaticSubprojectMapper simulationAutomaticSubprojectMapper;
+    @Resource
+    private SimulationManualProjectTaskMapper simulationManualProjectTaskMapper;
+    @Resource
+    private AlgorithmMapper algorithmMapper;
+    @Resource
+    private AlgorithmExpandMapper algorithmExpandMapper;
     @Resource
     private FileDownService fileDownService;
 
+    public String getAlgorithmNameByProjectId(String projectType, String projectId) {
+        String algorithmId;
+        String algorithmType;
+        if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
+            algorithmType = simulationManualProjectMapper.selectAlgorithmTypeById(SimulationManualProjectEntity.builder().id(projectId).build());
+            algorithmId = simulationManualProjectMapper.selectAlgorithmById(SimulationManualProjectEntity.builder().id(projectId).build());
+        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
+            String parentId = simulationAutomaticSubprojectMapper.selectParentIdById(SimulationAutomaticSubprojectEntity.builder().id(projectId).build());
+            algorithmType = simulationAutomaticProjectMapper.selectAlgorithmTypeById(SimulationAutomaticProjectEntity.builder().id(parentId).build());
+            algorithmId = simulationAutomaticProjectMapper.selectAlgorithmById();
+        } else {
+            throw new RuntimeException("未知项目类型：" + projectType);
+        }
+        if (DictConstants.ALGORITHM_UPLOAD_MODE_PLATFORM.equals(algorithmType)) {
+            final List<AlgorithmVO> select = algorithmExpandMapper.select(AlgorithmParameter.builder().algorithmId(algorithmId).build());
+            final AlgorithmVO algorithmVO = select.get(0);
+            return algorithmVO.getAlgorithmName() + "-" + algorithmVO.getAlgorithmVersion();
+        } else {
+            return algorithmMapper.selectAlgorithmNameByAlgorithmId(algorithmId);
+        }
+    }
+
     public String getLastProjectIdByAlgorithmId(String algorithmId) {
         return simulationProjectService.selectLastProjectIdByAlgorithmId(algorithmId);
     }
 
     public String getProjectTypeByProjectId(String projectId) {
-        SimulationManualProjectPO simulationManualProjectPO = simulationProjectMapper.selectProjectById(SimulationManualProjectParam.builder().id(projectId).build());
+        SimulationManualProjectPO simulationManualProjectPO = simulationManualProjectMapper.selectProjectById(SimulationManualProjectParam.builder().id(projectId).build());
         if (simulationManualProjectPO != null) {
             return DictConstants.PROJECT_TYPE_MANUAL;
         } else {
@@ -47,7 +81,7 @@ public class ProjectDomainService {
 
     public List<String> getVideoList(SimulationManualProjectParam simulationManualProjectParam) {
         List<String> videoList = new ArrayList<>();
-        List<String> runResultPaths = simulationProjectTaskMapper.selectRunResultPathByProjectId(simulationManualProjectParam);
+        List<String> runResultPaths = simulationManualProjectTaskMapper.selectRunResultPathByProjectId(simulationManualProjectParam);
         for (String runResultPath : runResultPaths) {
             ResponseBodyVO<List<String>> list = fileDownService.list(MinioParameter.builder().objectName(runResultPath).build());
             List<String> info = list.getInfo();

simulation-resource-server/src/main/java/com/css/simulation/resource/server/domain/service/UserDomainService.java

@@ -1,8 +1,8 @@
 package com.css.simulation.resource.server.domain.service;
 
 import api.common.pojo.constants.DictConstants;
-import com.css.simulation.resource.server.infrastructure.entity.SystemUserEntity;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserMapper;
+import com.css.simulation.resource.server.infrastructure.db.entity.SystemUserEntity;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemUserMapper;
 
 import javax.annotation.Resource;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/enums/ProjectRunStateEnum.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/enums/ProjectRunStateEnum.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.enums;
+package com.css.simulation.resource.server.infrastructure.common.enums;
 
 import lombok.Getter;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/enums/SceneTypeEnum.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/enums/SceneTypeEnum.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.enums;
+package com.css.simulation.resource.server.infrastructure.common.enums;
 
 import lombok.Getter;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/util/ApacheKafkaUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/util/ApacheKafkaUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.util;
+package com.css.simulation.resource.server.infrastructure.common.util;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/util/PdfBuilder.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/util/PdfBuilder.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.util;
+package com.css.simulation.resource.server.infrastructure.common.util;
 
 import com.css.simulation.resource.server.application.impl.SimulationProjectServiceImpl;
 import com.itextpdf.text.*;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/util/ProjectUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/util/ProjectUtil.java

@@ -1,18 +1,18 @@
-package com.css.simulation.resource.server.infrastructure.util;
+package com.css.simulation.resource.server.infrastructure.common.util;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.po.project.SimulationManualProjectPO;
 import api.common.pojo.po.scheduler.SchedulerProjectPO;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.AlgorithmMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelVehicleMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.AutoSubProjectMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ManualProjectMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.SimulationProjectMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.AlgorithmMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelVehicleMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.AutoSubProjectMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ManualProjectMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SimulationManualProjectMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -27,7 +27,7 @@ public class ProjectUtil {
     @Resource
     private AutoSubProjectMapper autoSubProjectMapper;
     @Resource
-    private SimulationProjectMapper simulationProjectMapper;
+    private SimulationManualProjectMapper simulationManualProjectMapper;
     @Resource
     private ScenePackageMapper scenePackageMapper;
     @Resource
@@ -71,7 +71,7 @@ public class ProjectUtil {
         if (StringUtil.isEmpty(param.getId()) || StringUtil.isEmpty(param.getNowRunState())) {
             throw new RuntimeException("参数为空。");
         } else {
-            SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
+            SimulationManualProjectPO po = simulationManualProjectMapper.selectProjectById(param);
             if (po == null) {
                 throw new RuntimeException("手动项目" + param.getId() + "不存在。");
             }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/util/SceneUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/util/SceneUtil.java

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.server.infrastructure.util;
+package com.css.simulation.resource.server.infrastructure.common.util;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import api.common.util.CollectionUtil;
 import api.common.util.HttpUtil;
 import api.common.util.LinuxUtil;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScoringRulesMapper;
+import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScoringRulesMapper;
 import lombok.SneakyThrows;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/util/VehicleUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/util/VehicleUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.util;
+package com.css.simulation.resource.server.infrastructure.common.util;
 
 import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.vo.model.VehicleVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/entity/SimulationAutomaticProjectEntity.java

@@ -0,0 +1,14 @@
+package com.css.simulation.resource.server.infrastructure.db.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimulationAutomaticProjectEntity {
+    private String id;
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/entity/SimulationAutomaticSubprojectEntity.java

@@ -0,0 +1,14 @@
+package com.css.simulation.resource.server.infrastructure.db.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimulationAutomaticSubprojectEntity {
+    private String id;
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/entity/SimulationManualProjectEntity.java

@@ -0,0 +1,16 @@
+package com.css.simulation.resource.server.infrastructure.db.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimulationManualProjectEntity {
+    private String id;
+    private String algorithm;
+    private String algorithmType;
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/entity/SystemUserEntity.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/entity/SystemUserEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.entity;
+package com.css.simulation.resource.server.infrastructure.db.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/AlgorithmExpandMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/AlgorithmExpandMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.algorithm.AlgorithmParameter;
 import api.common.pojo.vo.algorithm.AlgorithmVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/AlgorithmMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/AlgorithmMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.algorithm.AlgorithmParameter;
 import api.common.pojo.po.algorithm.AlgorithmPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/AutoSubProjectMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/AutoSubProjectMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 
 import api.common.pojo.po.scheduler.SchedulerProjectPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/CameraMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/CameraMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.model.CameraParam;
 import api.common.pojo.po.model.CameraPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/ClusterMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/ClusterMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.system.ClusterParam;
 import api.common.pojo.po.system.ClusterPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/ConfigMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/ConfigMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 
 import api.common.pojo.param.model.ConfigPageParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/DictMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/DictMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 
 import api.common.pojo.po.system.DictPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/GpsMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/GpsMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 
 import api.common.pojo.param.model.GpsParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/HomePageMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/HomePageMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.po.home.SystemServerPO;
 import api.common.pojo.vo.home.LineChartVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/LidarMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/LidarMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 
 import api.common.pojo.param.model.LidarParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/LogMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/LogMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.log.LogPageParam;
 import api.common.pojo.po.log.LogLoginPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/ManualProjectMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/ManualProjectMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 
 import api.common.pojo.po.scheduler.SchedulerProjectPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/MenuMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/MenuMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.vo.system.MenuVO;
 import org.apache.ibatis.annotations.Mapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/ModelConfigMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/ModelConfigMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.po.model.ConfigPO;
 import org.apache.ibatis.annotations.Mapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/ModelVehicleMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/ModelVehicleMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/OgtMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/OgtMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 
 import api.common.pojo.param.model.OgtParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/ParameterMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/ParameterMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.system.ParameterParam;
 import api.common.pojo.po.system.ParameterPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/RelationConfigSensorMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/RelationConfigSensorMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 
 import org.apache.ibatis.annotations.Delete;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/RoleMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/RoleMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.system.RoleParam;
 import api.common.pojo.po.system.RoleMenuPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SceneAccidentMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SceneAccidentMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.scene.SceneAccidentParam;
 import api.common.pojo.param.scene.SceneDeleteParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SceneGeneralDataMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SceneGeneralDataMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.po.scene.SceneGeneralDataPO;
 import org.apache.ibatis.annotations.Mapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SceneGeneralExampleMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SceneGeneralExampleMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.po.scene.SceneGeneralExamplePO;
 import org.apache.ibatis.annotations.Mapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SceneGeneralTemplateMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SceneGeneralTemplateMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.scene.SceneGeneralTemplateParam;
 import api.common.pojo.po.scene.SceneGeneralTemplatePO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SceneImportMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SceneImportMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.system.SceneImportPageParam;
 import api.common.pojo.po.system.SceneImportPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SceneNaturalMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SceneNaturalMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.scene.SceneDeleteParam;
 import api.common.pojo.param.scene.SceneNaturalParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/ScenePackageMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/ScenePackageMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.scene.ScenePackageParam;
 import api.common.pojo.po.scene.ScenePackagePO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/ScenePackageSublistMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/ScenePackageSublistMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.scene.SceneDeleteParam;
 import api.common.pojo.param.scene.ScenePackageSublistParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SceneStandardsRegulationsMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SceneStandardsRegulationsMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.scene.SceneDeleteParam;
 import api.common.pojo.param.scene.StandardsRegulationsParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/ScoringRulesMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/ScoringRulesMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.scene.ScoringRulesParam;
 import api.common.pojo.po.scene.ScoringRulesPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SimulationAutomaticProjectMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SimulationAutomaticProjectMapper.java

@@ -1,9 +1,10 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.algorithm.AlgorithmParameter;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.po.project.*;
 import api.common.pojo.vo.project.*;
+import com.css.simulation.resource.server.infrastructure.db.entity.SimulationAutomaticProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -39,4 +40,7 @@ public interface SimulationAutomaticProjectMapper {
      int updateAutomaticRunTimes(SimulationAutomaticProjectPO po);
 
 
+    String selectAlgorithmTypeById(SimulationAutomaticProjectEntity build);
+
+     String selectAlgorithmById();
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SimulationAutomaticSubProjectMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SimulationAutomaticSubprojectMapper.java

@@ -1,35 +1,26 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.po.project.SimulationAutomaticSubProjectPO;
 import api.common.pojo.vo.project.SimulationManualProjectVO;
+import com.css.simulation.resource.server.infrastructure.db.entity.SimulationAutomaticSubprojectEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Mapper
 @Repository
-public interface SimulationAutomaticSubProjectMapper {
-
+public interface SimulationAutomaticSubprojectMapper {
      SimulationAutomaticSubProjectPO selectById(SimulationManualProjectParam param);
-
      SimulationAutomaticSubProjectPO selectLastProjectId(String id);
-
      int addAutomaticSubProject(SimulationAutomaticSubProjectPO po);
-
      List<SimulationAutomaticSubProjectPO> selectProjectNowRunState(String[] ids);
-
      int deleteProject(String[] ids);
-
      List<SimulationManualProjectVO> selectList(SimulationManualProjectParam param);
-
      SimulationManualProjectVO selectProjectInfo(SimulationManualProjectParam param);
-
      int updateNowRunState(SimulationManualProjectParam param);
-
-     @Select("select report from simulation_automatic_subproject where id = #{id}")
      String selectReportById(@Param("id") String id);
+     String selectParentIdById(SimulationAutomaticSubprojectEntity build);
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SimulationProjectMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SimulationManualProjectMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.po.algorithm.AlgorithmPO;
@@ -10,24 +10,17 @@ import api.common.pojo.po.project.SimulationMptFirstTargetScorePO;
 import api.common.pojo.po.project.SimulationMptLastTargetScorePO;
 import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.vo.project.*;
+import com.css.simulation.resource.server.infrastructure.db.entity.SimulationManualProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Map;
 
 @Mapper
-@Repository
-public interface SimulationProjectMapper {
-
-    @Select("select scene\n" +
-            "        from simulation_manual_project\n" +
-            "        where is_deleted = '0'\n" +
-            "          and id = #{id,jdbcType=VARCHAR}")
-    String selectSceneById(@Param("id") String id);
+public interface SimulationManualProjectMapper {
 
     int add(SimulationManualProjectPO po);
 
@@ -59,7 +52,7 @@ public interface SimulationProjectMapper {
     @Select("select id, algorithm_name, description\n" +
             "        from algorithm\n" +
             "        where id = #{algorithmId}")
-    AlgorithmPO selectAlgorithmById(@Param("algorithmId") String algorithmId);
+    AlgorithmPO selectAlgorithmInfoById(@Param("algorithmId") String algorithmId);
 
     List<VehiclePO> selectVehicleBaseInfoById(String id);
 
@@ -147,4 +140,8 @@ public interface SimulationProjectMapper {
 
     @Select("select report from simulation_manual_project where id = #{id}")
     String selectReportById(@Param("id") String id);
+
+    String selectAlgorithmTypeById(SimulationManualProjectEntity build);
+
+    String selectAlgorithmById(SimulationManualProjectEntity build);
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SimulationProjectTaskMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SimulationManualProjectTaskMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.project.ProjectTaskParam;
 import api.common.pojo.param.project.SceneScoreParam;
@@ -18,7 +18,7 @@ import java.util.Map;
 
 @Mapper
 @Repository
-public interface SimulationProjectTaskMapper {
+public interface SimulationManualProjectTaskMapper {
 
     List<ManualProjectTaskPO> selectProjectTask(ProjectTaskParam vo);
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SimulationMptFirstTargetScoreMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SimulationMptFirstTargetScoreMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.po.project.SimulationMptFirstTargetScorePO;
 import org.apache.ibatis.annotations.Mapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SimulationMptLastTargetScoreMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SimulationMptLastTargetScoreMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.po.project.SimulationMptLastTargetScorePO;
 import org.apache.ibatis.annotations.Mapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SystemScenePackageMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/db/mysql/mapper/SystemScenePackageMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.mysql.mapper;
+package com.css.simulation.resource.server.infrastructure.db.mysql.mapper;
 
 import api.common.pojo.param.scene.SystemScenePackageParam;
 import api.common.pojo.po.scene.SystemScenePackageNewPO;