下载算法平台文件

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

@@ -877,7 +877,7 @@ public class ProjectDomainService {
     @SneakyThrows
     public void selectProjectReportById(String projectType, String projectId) {
 //        String tokenUrl = customConfiguration.getTokenUri() + "?grant_type=client_credentials" + "&client_id=" + customConfiguration.getClientId() + "&client_secret=" + customConfiguration.getClientSecret();
-        String tokenUrl = "http://cloudsimulation.china-icv.cn/simulation/oauth/client/sign/username?username=sysadmin&password=123456";
+        String tokenUrl = "http://10.14.85.241/simulation/oauth/client/sign/username?username=sysadmin&password=123456";
         log.debug("获取仿真云平台 token：" + tokenUrl);
         String response = HttpUtil.get(tokenUrl);
         ObjectMapper objectMapper = new ObjectMapper();

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/advice/ExceptionHandlerControllerAdvice.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/advice/ExceptionHandlerControllerAdvice.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.advice;
+package com.css.simulation.resource.server.adapter.advice;
 
 import api.common.pojo.common.ResponseBodyVO;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/DictController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/DictController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.adapter.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.DictParam;

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

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.adapter.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 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.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.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/MenuController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/MenuController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.adapter.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.vo.system.MenuVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/algorithm_library/AlgorithmLibraryController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/algorithm_library/AlgorithmLibraryController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.algorithm_library;
+package com.css.simulation.resource.server.adapter.controller.algorithm_library;
 
 
 import api.common.pojo.common.ResponseBodyVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/home_page/HomePageController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/home_page/HomePageController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.home_page;
+package com.css.simulation.resource.server.adapter.controller.home_page;
 
 import api.common.pojo.common.PageVO;
 import api.common.pojo.common.ResponseBodyVO;

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

@@ -1,10 +1,10 @@
-package com.css.simulation.resource.server.api.controller.job_manage;
+package com.css.simulation.resource.server.adapter.controller.job_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 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.adapter.parameter.ProjectParam;
 import com.css.simulation.resource.server.app.service.job_manage.JobManageApplicationService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/JobManageController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/job_manage/JobManageController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.job_manage;
+package com.css.simulation.resource.server.adapter.controller.job_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.DictParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/MonitorController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/job_manage/MonitorController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.job_manage;
+package com.css.simulation.resource.server.adapter.controller.job_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/dynamic_configuration/VehicleController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/model_library/dynamic_configuration/VehicleController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.model_library.dynamic_configuration;
+package com.css.simulation.resource.server.adapter.controller.model_library.dynamic_configuration;
 
 
 import api.common.pojo.common.ResponseBodyVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/dynamic_configuration/VehicleTemplateController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/model_library/dynamic_configuration/VehicleTemplateController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.model_library.dynamic_configuration;
+package com.css.simulation.resource.server.adapter.controller.model_library.dynamic_configuration;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.model.VehiclePageParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorCameraController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/model_library/sensor_configuration/SensorCameraController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.model_library.sensor_configuration;
+package com.css.simulation.resource.server.adapter.controller.model_library.sensor_configuration;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/model_library/sensor_configuration/SensorController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.model_library.sensor_configuration;
+package com.css.simulation.resource.server.adapter.controller.model_library.sensor_configuration;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.model.CameraParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorGpsController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/model_library/sensor_configuration/SensorGpsController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.model_library.sensor_configuration;
+package com.css.simulation.resource.server.adapter.controller.model_library.sensor_configuration;
 
 
 import api.common.pojo.common.ResponseBodyVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorLidarController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/model_library/sensor_configuration/SensorLidarController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.model_library.sensor_configuration;
+package com.css.simulation.resource.server.adapter.controller.model_library.sensor_configuration;
 
 
 import api.common.pojo.common.ResponseBodyVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorOgtController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/model_library/sensor_configuration/SensorOgtController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.model_library.sensor_configuration;
+package com.css.simulation.resource.server.adapter.controller.model_library.sensor_configuration;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/vehicle_configuration/ModelConfigController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/model_library/vehicle_configuration/ModelConfigController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.model_library.vehicle_configuration;
+package com.css.simulation.resource.server.adapter.controller.model_library.vehicle_configuration;
 
 
 import api.common.pojo.common.ResponseBodyVO;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.personal_information;
+package com.css.simulation.resource.server.adapter.controller.personal_information;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/accident/SceneAccidentController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/scene_library/accident/SceneAccidentController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.scene_library.accident;
+package com.css.simulation.resource.server.adapter.controller.scene_library.accident;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.scene_library.general;
+package com.css.simulation.resource.server.adapter.controller.scene_library.general;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -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.infra.util.PageUtil;
-import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.FileDownService;
 import com.css.simulation.resource.server.app.service.LogService;
 import com.css.simulation.resource.server.app.service.SceneGeneralExampleService;
 import com.css.simulation.resource.server.app.service.SceneGeneralTemplateService;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/natural/SceneNaturalController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/scene_library/natural/SceneNaturalController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.scene_library.natural;
+package com.css.simulation.resource.server.adapter.controller.scene_library.natural;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.scene_library.scene_test_package;
+package com.css.simulation.resource.server.adapter.controller.scene_library.scene_test_package;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/score_rule/ScoreRuleController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/scene_library/score_rule/ScoreRuleController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.scene_library.score_rule;
+package com.css.simulation.resource.server.adapter.controller.scene_library.score_rule;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/standard/SceneStandardsController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/scene_library/standard/SceneStandardsController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.scene_library.standard;
+package com.css.simulation.resource.server.adapter.controller.scene_library.standard;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/account_manage/RoleController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/system_manage/account_manage/RoleController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.system_manage.account_manage;
+package com.css.simulation.resource.server.adapter.controller.system_manage.account_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.RoleParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/account_manage/UserController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/system_manage/account_manage/UserController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.system_manage.account_manage;
+package com.css.simulation.resource.server.adapter.controller.system_manage.account_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.UserParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/cluster_manage/ClusterController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/system_manage/cluster_manage/ClusterController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.system_manage.cluster_manage;
+package com.css.simulation.resource.server.adapter.controller.system_manage.cluster_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.ClusterParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/log_manage/LogController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/system_manage/log_manage/LogController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.system_manage.log_manage;
+package com.css.simulation.resource.server.adapter.controller.system_manage.log_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.log.LogPageParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/parameter_manage/ParameterController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/system_manage/parameter_manage/ParameterController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.system_manage.parameter_manage;
+package com.css.simulation.resource.server.adapter.controller.system_manage.parameter_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.ParameterParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/scene_package_manage/ScenePackageController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/system_manage/scene_package_manage/ScenePackageController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.system_manage.scene_package_manage;
+package com.css.simulation.resource.server.adapter.controller.system_manage.scene_package_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.SystemScenePackageParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/scene_package_share/SyetemUserSceneController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/system_manage/scene_package_share/SyetemUserSceneController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.system_manage.scene_package_share;
+package com.css.simulation.resource.server.adapter.controller.system_manage.scene_package_share;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.scene.SystemUserScenePO;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller.system_manage.scene_upload;
+package com.css.simulation.resource.server.adapter.controller.system_manage.scene_upload;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -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.infra.oauth.AuthorizationHolder;
-import com.css.simulation.resource.server.acl.SceneService;
+import com.css.simulation.resource.server.infra.feign.service.SceneService;
 import com.css.simulation.resource.server.app.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/api/parameter/ProjectParam.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/parameter/ProjectParam.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.parameter;
+package com.css.simulation.resource.server.adapter.parameter;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/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.AlgoPlatformService;
-import com.css.simulation.resource.server.acl.FileDownService;
-import com.css.simulation.resource.server.acl.SchedulerService;
+import com.css.simulation.resource.server.infra.feign.service.AlgoPlatformService;
+import com.css.simulation.resource.server.infra.feign.service.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.SchedulerService;
 import com.css.simulation.resource.server.app.service.AlgorithmService;
 import com.css.simulation.resource.server.app.service.DictService;
 import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;

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

@@ -26,9 +26,9 @@ import com.css.simulation.resource.server.infra.db.mysql.mapper.*;
 import com.css.simulation.resource.server.app.service.AlgorithmService;
 import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.util.PageUtil;
-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.infra.feign.service.AlgoPlatformService;
+import com.css.simulation.resource.server.infra.feign.service.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.MonitorService;
 import com.css.simulation.resource.server.app.constant.ProjectRunStateEnum;
 import com.css.simulation.resource.server.app.constant.SceneTypeEnum;
 import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;
@@ -2129,7 +2129,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
              */
             // 测试得分，指标评价，得分说明 --处理
             if (isEmpty(targetEvaluate) || isEmpty(sp.getScoreExplain())) {
-                sublistName += ProjectConstants.SEPARATOR + sp.getReturnSceneId() + ProjectConstants.SEPARATOR + sp.getSceneType() + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--";
+                sublistName += ProjectConstants.SEPARATOR + sp.getReturnSceneId() + ProjectConstants.SEPARATOR + sp.getSceneType() + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--" + ProjectConstants.SEPARATOR + "--";
             } else {
                 sublistName += ProjectConstants.SEPARATOR + sp.getReturnSceneId() + ProjectConstants.SEPARATOR + sp.getSceneType() + ProjectConstants.SEPARATOR + sceneScore + ProjectConstants.SEPARATOR + targetEvaluate + ProjectConstants.SEPARATOR + sp.getScoreExplain() + ProjectConstants.SEPARATOR + sp.getTimeActual() + ProjectConstants.SEPARATOR + sp.getTimeCorrection();
             }
@@ -2145,7 +2145,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         // 结果补全
         int r = 0;
         for (List<String> list : result) {
-            int start = list.size() - 5;
+            int start = list.size() - 7; // 这里需要根据字段数修改
             SceneScListVo sceneScListVo = new SceneScListVo();
             for (int i = 0; i < start; i++) {
                 if (0 == i) {
@@ -2199,7 +2199,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             r++;
         }
         List<Map<Object, Object>> headerList = new ArrayList<>();
-        int maxIndex = size - 5;
+        int maxIndex = size - 5;    // 这里的5是下面的字段
         projectReportVO.setMaxIndex(maxIndex);
         for (int i = 0; i < maxIndex; i++) {
             addHeaders(i, headerList);

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

@@ -6,7 +6,7 @@ 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.RedisService;
+import com.css.simulation.resource.server.infra.feign.service.RedisService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.DictMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

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

@@ -12,7 +12,7 @@ import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.util.PageUtil;
-import com.css.simulation.resource.server.acl.OauthClientService;
+import com.css.simulation.resource.server.infra.feign.service.OauthClientService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.HomePageMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.LogMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SimulationManualProjectTaskMapper;

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

@@ -11,7 +11,7 @@ import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infra.util.AuthUtil;
-import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.FileDownService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneAccidentMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageSublistMapper;

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

@@ -11,7 +11,7 @@ import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infra.util.AuthUtil;
-import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.FileDownService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneNaturalMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageSublistMapper;

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

@@ -11,7 +11,7 @@ import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infra.util.AuthUtil;
-import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.FileDownService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageSublistMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneStandardsRegulationsMapper;

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

@@ -8,7 +8,7 @@ import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.*;
 import com.css.simulation.resource.server.infra.util.AuthUtil;
-import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.FileDownService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ModelConfigMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.VehicleMapper;
 import com.css.simulation.resource.server.infra.util.VehicleUtil;

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

@@ -8,7 +8,7 @@ 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.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.FileDownService;
 import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.infra.db.entity.SimulationAutomaticProjectEntity;
 import com.css.simulation.resource.server.infra.db.entity.SimulationAutomaticSubprojectEntity;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/FeignConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/config/FeignConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.feign;
+package com.css.simulation.resource.server.infra.feign.config;
 
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.server.infra.oauth.AuthorizationHolder;

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

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.acl.impl;
+package com.css.simulation.resource.server.infra.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.server.acl.AlgoPlatformService;
+import com.css.simulation.resource.server.infra.feign.service.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/impl/FileDownServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/fallback/FileDownServiceFallback.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.server.acl.impl;
+package com.css.simulation.resource.server.infra.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.MinioParameter;
-import com.css.simulation.resource.server.acl.FileDownService;
+import com.css.simulation.resource.server.infra.feign.service.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/impl/KafkaServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/fallback/KafkaServiceFallback.java

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.acl.impl;
+package com.css.simulation.resource.server.infra.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.server.acl.SchedulerService;
+import com.css.simulation.resource.server.infra.feign.service.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/acl/AlgoPlatformService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/AlgoPlatformService.java

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

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

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl;
+package com.css.simulation.resource.server.infra.feign.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.MinioParameter;
-import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
-import com.css.simulation.resource.server.acl.impl.FileDownServiceFallback;
+import com.css.simulation.resource.server.infra.feign.config.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.fallback.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/KafkaService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/KafkaService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl;
+package com.css.simulation.resource.server.infra.feign.service;
 
 
 import api.common.pojo.param.KafkaParameter;
-import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
-import com.css.simulation.resource.server.acl.impl.KafkaServiceFallback;
+import com.css.simulation.resource.server.infra.feign.config.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.fallback.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/MonitorService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/MonitorService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl;
+package com.css.simulation.resource.server.infra.feign.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
-import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
-import com.css.simulation.resource.server.acl.impl.MonitorServiceFallback;
+import com.css.simulation.resource.server.infra.feign.config.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.fallback.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/OauthClientService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/OauthClientService.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.server.acl;
+package com.css.simulation.resource.server.infra.feign.service;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
-import com.css.simulation.resource.server.acl.impl.RedisServiceFallback;
+import com.css.simulation.resource.server.infra.feign.config.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.fallback.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/RedisService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/RedisService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl;
+package com.css.simulation.resource.server.infra.feign.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;
-import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
-import com.css.simulation.resource.server.acl.impl.RedisServiceFallback;
+import com.css.simulation.resource.server.infra.feign.config.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.fallback.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/SceneService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/SceneService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.acl;
+package com.css.simulation.resource.server.infra.feign.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.system.SceneImportPO;
-import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
-import com.css.simulation.resource.server.acl.impl.SceneServiceFallback;
+import com.css.simulation.resource.server.infra.feign.config.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.fallback.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/SchedulerService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/SchedulerService.java

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