LingxinMeng 2 년 전
부모
커밋
971c0339c9
84개의 변경된 파일165개의 추가작업 그리고 165개의 파일을 삭제
  1. 3 3
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/entity/VehicleEntity.java
  2. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/repository/TaskIndexRepository.java
  3. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/AlgorithmApplicationService.java
  4. 3 3
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/FileApplicationService.java
  5. 13 13
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/ProjectApplicationService.java
  6. 10 10
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/TaskApplicationService.java
  7. 18 18
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/ProjectDomainService.java
  8. 9 8
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/TaskDomainService.java
  9. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/custom/CustomConfiguration.java
  10. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/docker/DockerConfiguration.java
  11. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/entity/DockerNodeEntity.java
  12. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/entity/DynamicsEntity.java
  13. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/entity/NodeEntity.java
  14. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/git/GitConfiguration.java
  15. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/git/GitUtil.java
  16. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/init/CustomApplicationRunner.java
  17. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/kafka/KafkaAdminConfiguration.java
  18. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/kubernetes/KubernetesConfiguration.java
  19. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/kubernetes/KubernetesUtil.java
  20. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/minio/MinioConfiguration.java
  21. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/pool/PoolConfiguration.java
  22. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/pool/PoolParam.java
  23. 5 5
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/scheduler/AlgorithmScheduler.java
  24. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/scheduler/ProjectScheduler.java
  25. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/AlgorithmExpandEntity.java
  26. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/ScoringRuleEntity.java
  27. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/SimulationAutomaticProjectEntity.java
  28. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/SimulationAutomaticSubprojectEntity.java
  29. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/SimulationManualProjectEntity.java
  30. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/AlgorithmExpandMapper.java
  31. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/AlgorithmMapper.java
  32. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/ClusterMapper.java
  33. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/ConfigMapper.java
  34. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/IndexMapper.java
  35. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/IndexTemplateMapper.java
  36. 3 3
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SceneMapper.java
  37. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/ScoringRulesMapper.java
  38. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SensorCameraMapper.java
  39. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SensorOgtMapper.java
  40. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SimulationAutomaticProjectMapper.java
  41. 3 4
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SimulationAutomaticSubprojectMapper.java
  42. 3 3
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SimulationManualProjectMapper.java
  43. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SimulationManualProjectTaskMapper.java
  44. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/UserMapper.java
  45. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/VehicleMapper.java
  46. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/redis/CustomRedisClient.java
  47. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/redis/RedisTemplateConfiguration.java
  48. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/redis/RedisUtil.java
  49. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/AlgorithmEntity.java
  50. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/CameraEntity.java
  51. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ClusterEntity.java
  52. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/CpuNodeEntity.java
  53. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/IndexTemplateEntity.java
  54. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/InfoEntity.java
  55. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/LeafIndexEntity.java
  56. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ModelEntity.java
  57. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/NodeEntity.java
  58. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/OgtEntity.java
  59. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/PartitionEntity.java
  60. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/PrefixEntity.java
  61. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ProjectEntity.java
  62. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ScenarioEntity.java
  63. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/SceneEntity.java
  64. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ScoreEntity.java
  65. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/SensorsEntity.java
  66. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/TaskEntity.java
  67. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/TaskMessageEntity.java
  68. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/UserEntity.java
  69. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/VehicleEntity.java
  70. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/AlgorithmPlatform.java
  71. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/OauthParameter.java
  72. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/VideoFeignClient.java
  73. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/WebServerClient.java
  74. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/fallback/VideoFeignClientFallBack.java
  75. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/fallback/WebServerClientFallBack.java
  76. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/fs/minio/MinioUtil.java
  77. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/mq/kafka/KafkaUtil.java
  78. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/mq/kafka/consumer/ProjectConsumer.java
  79. 1 1
      simulation-resource-scheduler/src/main/resources/mysql/mapper/AlgorithmExpandMapper.xml
  80. 1 1
      simulation-resource-scheduler/src/main/resources/mysql/mapper/ScoringRulesMapper.xml
  81. 1 1
      simulation-resource-scheduler/src/main/resources/mysql/mapper/SimulationAutomaticProjectMapper.xml
  82. 1 1
      simulation-resource-scheduler/src/main/resources/mysql/mapper/SimulationAutomaticSubprojectMapper.xml
  83. 1 1
      simulation-resource-scheduler/src/main/resources/mysql/mapper/SimulationManualProjectMapper.xml
  84. 1 1
      simulation-resource-scheduler/src/main/resources/mysql/mapper/SimulationManualProjectTaskMapper.xml

+ 3 - 3
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/entity/VehicleEntity.java

@@ -1,8 +1,8 @@
 package com.css.simulation.resource.scheduler.application.entity;
 
-import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.DynamicsEntity;
-import com.css.simulation.resource.scheduler.infrastructure.entity.ModelEntity;
-import com.css.simulation.resource.scheduler.infrastructure.entity.SensorsEntity;
+import com.css.simulation.resource.scheduler.infra.configuration.entity.DynamicsEntity;
+import com.css.simulation.resource.scheduler.infra.entity.ModelEntity;
+import com.css.simulation.resource.scheduler.infra.entity.SensorsEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/repository/TaskIndexRepository.java

@@ -1,7 +1,7 @@
 package com.css.simulation.resource.scheduler.application.repository;
 
-import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.IndexMapper;
-import com.css.simulation.resource.scheduler.infrastructure.entity.LeafIndexEntity;
+import com.css.simulation.resource.scheduler.infra.db.mysql.mapper.IndexMapper;
+import com.css.simulation.resource.scheduler.infra.entity.LeafIndexEntity;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/AlgorithmApplicationService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.scheduler.application.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.util.FileUtil;
-import com.css.simulation.resource.scheduler.infrastructure.fs.minio.MinioUtil;
+import com.css.simulation.resource.scheduler.infra.fs.minio.MinioUtil;
 import io.minio.MinioClient;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;

+ 3 - 3
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/FileApplicationService.java

@@ -2,9 +2,9 @@ package com.css.simulation.resource.scheduler.application.service;
 
 import api.common.util.FileUtil;
 import api.common.util.HttpUtil;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.custom.CustomConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.NodeEntity;
+import com.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;
+import com.css.simulation.resource.scheduler.infra.configuration.kubernetes.KubernetesConfiguration;
+import com.css.simulation.resource.scheduler.infra.configuration.entity.NodeEntity;
 import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;

+ 13 - 13
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/ProjectApplicationService.java

@@ -7,18 +7,18 @@ import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueue
 import com.css.simulation.resource.scheduler.application.entity.VehicleEntity;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;
 import com.css.simulation.resource.scheduler.domain.service.TaskDomainService;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.custom.CustomConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.docker.DockerConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.DynamicsEntity;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.git.GitConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.git.GitUtil;
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.AlgorithmExpandEntity;
-import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.*;
-import com.css.simulation.resource.scheduler.infrastructure.db.redis.CustomRedisClient;
-import com.css.simulation.resource.scheduler.infrastructure.db.redis.RedisUtil;
-import com.css.simulation.resource.scheduler.infrastructure.entity.*;
-import com.css.simulation.resource.scheduler.infrastructure.fs.minio.MinioUtil;
-import com.css.simulation.resource.scheduler.infrastructure.mq.kafka.KafkaUtil;
+import com.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;
+import com.css.simulation.resource.scheduler.infra.configuration.docker.DockerConfiguration;
+import com.css.simulation.resource.scheduler.infra.configuration.entity.DynamicsEntity;
+import com.css.simulation.resource.scheduler.infra.configuration.git.GitConfiguration;
+import com.css.simulation.resource.scheduler.infra.configuration.git.GitUtil;
+import com.css.simulation.resource.scheduler.infra.db.entity.AlgorithmExpandEntity;
+import com.css.simulation.resource.scheduler.infra.db.mysql.mapper.*;
+import com.css.simulation.resource.scheduler.infra.db.redis.CustomRedisClient;
+import com.css.simulation.resource.scheduler.infra.db.redis.RedisUtil;
+import com.css.simulation.resource.scheduler.infra.entity.*;
+import com.css.simulation.resource.scheduler.infra.fs.minio.MinioUtil;
+import com.css.simulation.resource.scheduler.infra.mq.kafka.KafkaUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.minio.MinioClient;
@@ -154,7 +154,7 @@ public class ProjectApplicationService {
             // -------------------------------- 3 查询模型 --------------------------------
             log.debug("项目 " + projectId + " 开始查询模型。");
             //1 根据车辆配置id vehicleConfigId, 获取 模型信息和传感器信息
-            com.css.simulation.resource.scheduler.infrastructure.entity.VehicleEntity vehicleEntity = vehicleMapper.selectByVehicleConfigId(vehicleConfigId);   // 车辆
+            com.css.simulation.resource.scheduler.infra.entity.VehicleEntity vehicleEntity = vehicleMapper.selectByVehicleConfigId(vehicleConfigId);   // 车辆
             List<CameraEntity> cameraEntityList = sensorCameraMapper.selectCameraByVehicleConfigId(vehicleConfigId);    // 摄像头
             List<OgtEntity> ogtEntityList = sensorOgtMapper.selectOgtByVehicleId(vehicleConfigId); // 完美传感器
             log.debug("项目 " + projectId + " 开始保存任务消息。");

+ 10 - 10
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/TaskApplicationService.java

@@ -5,16 +5,16 @@ import api.common.util.HttpUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;
 import com.css.simulation.resource.scheduler.domain.service.TaskDomainService;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.custom.CustomConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesUtil;
-import com.css.simulation.resource.scheduler.infrastructure.fs.minio.MinioUtil;
-import com.css.simulation.resource.scheduler.infrastructure.db.redis.CustomRedisClient;
-import com.css.simulation.resource.scheduler.infrastructure.entity.PrefixEntity;
-import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
-import com.css.simulation.resource.scheduler.infrastructure.entity.TaskEntity;
-import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.SimulationManualProjectTaskMapper;
-import com.css.simulation.resource.scheduler.infrastructure.db.redis.RedisUtil;
+import com.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;
+import com.css.simulation.resource.scheduler.infra.configuration.kubernetes.KubernetesConfiguration;
+import com.css.simulation.resource.scheduler.infra.configuration.kubernetes.KubernetesUtil;
+import com.css.simulation.resource.scheduler.infra.fs.minio.MinioUtil;
+import com.css.simulation.resource.scheduler.infra.db.redis.CustomRedisClient;
+import com.css.simulation.resource.scheduler.infra.entity.PrefixEntity;
+import com.css.simulation.resource.scheduler.infra.entity.ProjectEntity;
+import com.css.simulation.resource.scheduler.infra.entity.TaskEntity;
+import com.css.simulation.resource.scheduler.infra.db.mysql.mapper.SimulationManualProjectTaskMapper;
+import com.css.simulation.resource.scheduler.infra.db.redis.RedisUtil;
 import io.kubernetes.client.openapi.ApiClient;
 import io.minio.MinioClient;
 import lombok.extern.slf4j.Slf4j;

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

@@ -5,21 +5,21 @@ import api.common.pojo.constants.DictConstants;
 import api.common.util.*;
 import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
 import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.custom.CustomConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.NodeEntity;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.minio.MinioConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.AlgorithmExpandEntity;
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticProjectEntity;
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticSubprojectEntity;
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationManualProjectEntity;
-import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.*;
-import com.css.simulation.resource.scheduler.infrastructure.entity.PrefixEntity;
-import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
-import com.css.simulation.resource.scheduler.infrastructure.entity.UserEntity;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesUtil;
-import com.css.simulation.resource.scheduler.infrastructure.db.redis.CustomRedisClient;
-import com.css.simulation.resource.scheduler.infrastructure.db.redis.RedisUtil;
+import com.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;
+import com.css.simulation.resource.scheduler.infra.configuration.entity.NodeEntity;
+import com.css.simulation.resource.scheduler.infra.configuration.kubernetes.KubernetesConfiguration;
+import com.css.simulation.resource.scheduler.infra.configuration.minio.MinioConfiguration;
+import com.css.simulation.resource.scheduler.infra.db.entity.AlgorithmExpandEntity;
+import com.css.simulation.resource.scheduler.infra.db.entity.SimulationAutomaticProjectEntity;
+import com.css.simulation.resource.scheduler.infra.db.entity.SimulationAutomaticSubprojectEntity;
+import com.css.simulation.resource.scheduler.infra.db.entity.SimulationManualProjectEntity;
+import com.css.simulation.resource.scheduler.infra.db.mysql.mapper.*;
+import com.css.simulation.resource.scheduler.infra.entity.PrefixEntity;
+import com.css.simulation.resource.scheduler.infra.entity.ProjectEntity;
+import com.css.simulation.resource.scheduler.infra.entity.UserEntity;
+import com.css.simulation.resource.scheduler.infra.configuration.kubernetes.KubernetesUtil;
+import com.css.simulation.resource.scheduler.infra.db.redis.CustomRedisClient;
+import com.css.simulation.resource.scheduler.infra.db.redis.RedisUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -204,11 +204,11 @@ public class ProjectDomainService {
     }
 
 
-    public List<com.css.simulation.resource.scheduler.infrastructure.entity.NodeEntity> getNodeListToCount(Map<String, Integer> nodeMap) {
-        List<com.css.simulation.resource.scheduler.infrastructure.entity.NodeEntity> result = new ArrayList<>();
+    public List<com.css.simulation.resource.scheduler.infra.entity.NodeEntity> getNodeListToCount(Map<String, Integer> nodeMap) {
+        List<com.css.simulation.resource.scheduler.infra.entity.NodeEntity> result = new ArrayList<>();
         nodeMap.forEach((nodeName, parallelism) -> {
             for (int i = 0; i < parallelism; i++) {
-                result.add(new com.css.simulation.resource.scheduler.infrastructure.entity.NodeEntity(nodeName, 0));
+                result.add(new com.css.simulation.resource.scheduler.infra.entity.NodeEntity(nodeName, 0));
             }
         });
         return result;

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

@@ -3,13 +3,13 @@ package com.css.simulation.resource.scheduler.domain.service;
 import api.common.pojo.constants.DictConstants;
 import api.common.util.*;
 import com.css.simulation.resource.scheduler.application.repository.TaskIndexRepository;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.custom.CustomConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.ScoringRuleEntity;
-import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.*;
-import com.css.simulation.resource.scheduler.infrastructure.db.redis.RedisUtil;
-import com.css.simulation.resource.scheduler.infrastructure.entity.*;
-import com.css.simulation.resource.scheduler.infrastructure.fs.minio.MinioUtil;
-import com.css.simulation.resource.scheduler.infrastructure.mq.kafka.KafkaUtil;
+import com.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;
+import com.css.simulation.resource.scheduler.infra.db.entity.ScoringRuleEntity;
+import com.css.simulation.resource.scheduler.infra.db.mysql.mapper.*;
+import com.css.simulation.resource.scheduler.infra.db.redis.RedisUtil;
+import com.css.simulation.resource.scheduler.infra.entity.*;
+import com.css.simulation.resource.scheduler.infra.fs.minio.MinioUtil;
+import com.css.simulation.resource.scheduler.infra.mq.kafka.KafkaUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.minio.MinioClient;
@@ -163,7 +163,8 @@ public class TaskDomainService {
                             runResultFilePath + "/output_objectState.csv",
                             runResultFilePath + "/output_roadMark.csv",
                             runResultFilePath + "/output_roadPos.csv",
-                            runResultFilePath + "/output_trafficSignal.csv"
+                            runResultFilePath + "/output_trafficSignal.csv",
+                            runResultFilePath + "/output_trafficLight.csv"
                     );
                     for (String csvResultFileMinioPath : csvResultFilePaths) {
                         String csvResultFileLinuxPath = linuxTempPath + csvResultFileMinioPath;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/custom/CustomConfiguration.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/custom/CustomConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.custom;
+package com.css.simulation.resource.scheduler.infra.configuration.custom;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/docker/DockerConfiguration.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/docker/DockerConfiguration.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.docker;
+package com.css.simulation.resource.scheduler.infra.configuration.docker;
 
-import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.DockerNodeEntity;
+import com.css.simulation.resource.scheduler.infra.configuration.entity.DockerNodeEntity;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/entity/DockerNodeEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/entity/DockerNodeEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.entity;
+package com.css.simulation.resource.scheduler.infra.configuration.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/entity/DynamicsEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/entity/DynamicsEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.entity;
+package com.css.simulation.resource.scheduler.infra.configuration.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/entity/NodeEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/entity/NodeEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.entity;
+package com.css.simulation.resource.scheduler.infra.configuration.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/git/GitConfiguration.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/git/GitConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.git;
+package com.css.simulation.resource.scheduler.infra.configuration.git;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/git/GitUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/git/GitUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.git;
+package com.css.simulation.resource.scheduler.infra.configuration.git;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/init/CustomApplicationRunner.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/init/CustomApplicationRunner.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.init;
+package com.css.simulation.resource.scheduler.infra.configuration.init;
 
-import com.css.simulation.resource.scheduler.infrastructure.db.redis.CustomRedisClient;
+import com.css.simulation.resource.scheduler.infra.db.redis.CustomRedisClient;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/kafka/KafkaAdminConfiguration.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/kafka/KafkaAdminConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.kafka;
+package com.css.simulation.resource.scheduler.infra.configuration.kafka;
 
 import org.apache.kafka.clients.admin.Admin;
 import org.apache.kafka.clients.admin.KafkaAdminClient;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/kubernetes/KubernetesConfiguration.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/kubernetes/KubernetesConfiguration.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes;
+package com.css.simulation.resource.scheduler.infra.configuration.kubernetes;
 
-import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.NodeEntity;
+import com.css.simulation.resource.scheduler.infra.configuration.entity.NodeEntity;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.util.ClientBuilder;
 import io.kubernetes.client.util.KubeConfig;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/kubernetes/KubernetesUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/kubernetes/KubernetesUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes;
+package com.css.simulation.resource.scheduler.infra.configuration.kubernetes;
 
 import api.common.util.OsUtil;
 import io.kubernetes.client.openapi.ApiClient;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/minio/MinioConfiguration.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/minio/MinioConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.minio;
+package com.css.simulation.resource.scheduler.infra.configuration.minio;
 
 import io.minio.MinioClient;
 import lombok.Data;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/pool/PoolConfiguration.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/pool/PoolConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.pool;
+package com.css.simulation.resource.scheduler.infra.configuration.pool;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/pool/PoolParam.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/pool/PoolParam.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.pool;
+package com.css.simulation.resource.scheduler.infra.configuration.pool;
 
 import lombok.Data;
 

+ 5 - 5
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/scheduler/AlgorithmScheduler.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/scheduler/AlgorithmScheduler.java

@@ -1,10 +1,10 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.scheduler;
+package com.css.simulation.resource.scheduler.infra.configuration.scheduler;
 
 import api.common.util.SshUtil;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.docker.DockerConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.AlgorithmMapper;
-import com.css.simulation.resource.scheduler.infrastructure.entity.AlgorithmEntity;
-import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.DockerNodeEntity;
+import com.css.simulation.resource.scheduler.infra.configuration.docker.DockerConfiguration;
+import com.css.simulation.resource.scheduler.infra.db.mysql.mapper.AlgorithmMapper;
+import com.css.simulation.resource.scheduler.infra.entity.AlgorithmEntity;
+import com.css.simulation.resource.scheduler.infra.configuration.entity.DockerNodeEntity;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.sshd.client.SshClient;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/scheduler/ProjectScheduler.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/scheduler/ProjectScheduler.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.configuration.scheduler;
+package com.css.simulation.resource.scheduler.infra.configuration.scheduler;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.CollectionUtil;
@@ -6,7 +6,7 @@ import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
 import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
 import com.css.simulation.resource.scheduler.application.service.ProjectApplicationService;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;
-import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
+import com.css.simulation.resource.scheduler.infra.entity.ProjectEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/AlgorithmExpandEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/AlgorithmExpandEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/ScoringRuleEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/ScoringRuleEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/SimulationAutomaticProjectEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/SimulationAutomaticProjectEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/SimulationAutomaticSubprojectEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/SimulationAutomaticSubprojectEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/SimulationManualProjectEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/entity/SimulationManualProjectEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.entity;
+package com.css.simulation.resource.scheduler.infra.db.entity;
 
 import lombok.*;
 

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/AlgorithmExpandMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/AlgorithmExpandMapper.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.AlgorithmExpandEntity;
+import com.css.simulation.resource.scheduler.infra.db.entity.AlgorithmExpandEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/AlgorithmMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/AlgorithmMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.AlgorithmEntity;
+import com.css.simulation.resource.scheduler.infra.entity.AlgorithmEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/ClusterMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/ClusterMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.ClusterEntity;
+import com.css.simulation.resource.scheduler.infra.entity.ClusterEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/ConfigMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/ConfigMapper.java

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

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/IndexMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/IndexMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.LeafIndexEntity;
+import com.css.simulation.resource.scheduler.infra.entity.LeafIndexEntity;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;

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

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.IndexTemplateEntity;
+import com.css.simulation.resource.scheduler.infra.entity.IndexTemplateEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

+ 3 - 3
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SceneMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SceneMapper.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.IndexTemplateEntity;
-import com.css.simulation.resource.scheduler.infrastructure.entity.SceneEntity;
+import com.css.simulation.resource.scheduler.infra.entity.IndexTemplateEntity;
+import com.css.simulation.resource.scheduler.infra.entity.SceneEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/ScoringRulesMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/ScoringRulesMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.ScoringRuleEntity;
+import com.css.simulation.resource.scheduler.infra.db.entity.ScoringRuleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SensorCameraMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SensorCameraMapper.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.CameraEntity;
+import com.css.simulation.resource.scheduler.infra.entity.CameraEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SensorOgtMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SensorOgtMapper.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.OgtEntity;
+import com.css.simulation.resource.scheduler.infra.entity.OgtEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SimulationAutomaticProjectMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SimulationAutomaticProjectMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticProjectEntity;
+import com.css.simulation.resource.scheduler.infra.db.entity.SimulationAutomaticProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 3 - 4
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SimulationAutomaticSubprojectMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SimulationAutomaticSubprojectMapper.java

@@ -1,10 +1,9 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
 import api.common.pojo.po.scheduler.SchedulerProjectPO;
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticProjectEntity;
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticSubprojectEntity;
-import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
+import com.css.simulation.resource.scheduler.infra.db.entity.SimulationAutomaticSubprojectEntity;
+import com.css.simulation.resource.scheduler.infra.entity.ProjectEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

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

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
 import api.common.pojo.po.scheduler.SchedulerProjectPO;
-import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationManualProjectEntity;
-import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
+import com.css.simulation.resource.scheduler.infra.db.entity.SimulationManualProjectEntity;
+import com.css.simulation.resource.scheduler.infra.entity.ProjectEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

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

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.TaskEntity;
+import com.css.simulation.resource.scheduler.infra.entity.TaskEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/UserMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/UserMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.UserEntity;
+import com.css.simulation.resource.scheduler.infra.entity.UserEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/VehicleMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/VehicleMapper.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
-import com.css.simulation.resource.scheduler.infrastructure.entity.VehicleEntity;
+import com.css.simulation.resource.scheduler.infra.entity.VehicleEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/redis/CustomRedisClient.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/redis/CustomRedisClient.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.redis;
+package com.css.simulation.resource.scheduler.infra.db.redis;
 
 import api.common.util.CollectionUtil;
 import lombok.SneakyThrows;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/redis/RedisTemplateConfiguration.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/redis/RedisTemplateConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.redis;
+package com.css.simulation.resource.scheduler.infra.db.redis;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/redis/RedisUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/redis/RedisUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.db.redis;
+package com.css.simulation.resource.scheduler.infra.db.redis;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/AlgorithmEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/AlgorithmEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.entity;
+package com.css.simulation.resource.scheduler.infra.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/CameraEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/CameraEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.entity;
+package com.css.simulation.resource.scheduler.infra.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/ClusterEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ClusterEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.entity;
+package com.css.simulation.resource.scheduler.infra.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/CpuNodeEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/CpuNodeEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/IndexTemplateEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/IndexTemplateEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/InfoEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/InfoEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/LeafIndexEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/LeafIndexEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.entity;
+package com.css.simulation.resource.scheduler.infra.entity;
 
 import api.common.pojo.common.CommonPO;
 import lombok.*;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/ModelEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ModelEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/NodeEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/NodeEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/OgtEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/OgtEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/PartitionEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/PartitionEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.entity;
+package com.css.simulation.resource.scheduler.infra.entity;
 
 
 import lombok.AllArgsConstructor;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/PrefixEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/PrefixEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.entity;
+package com.css.simulation.resource.scheduler.infra.entity;
 
 
 import lombok.AllArgsConstructor;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/ProjectEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ProjectEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/ScenarioEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ScenarioEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/SceneEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/SceneEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/ScoreEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/ScoreEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/SensorsEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/SensorsEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/TaskEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/TaskEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.entity;
+package com.css.simulation.resource.scheduler.infra.entity;
 
 import api.common.pojo.common.CommonPO;
 import lombok.*;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/TaskMessageEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/TaskMessageEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.entity;
+package com.css.simulation.resource.scheduler.infra.entity;
 
 import com.css.simulation.resource.scheduler.application.entity.VehicleEntity;
 import lombok.AllArgsConstructor;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/UserEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/UserEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.entity;
+package com.css.simulation.resource.scheduler.infra.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/VehicleEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/VehicleEntity.java

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

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/acl/algorithm/AlgorithmPlatform.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/AlgorithmPlatform.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.acl.algorithm;
+package com.css.simulation.resource.scheduler.infra.feign.algorithm;
 
 import api.common.util.HttpUtil;
 import api.common.util.JsonUtil;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/acl/algorithm/OauthParameter.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/OauthParameter.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.acl.algorithm;
+package com.css.simulation.resource.scheduler.infra.feign.algorithm;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/feign/VideoFeignClient.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/VideoFeignClient.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.domain.feign;
+package com.css.simulation.resource.scheduler.infra.feign.algorithm;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.scheduler.domain.feign.fallback.VideoFeignClientFallBack;
+import com.css.simulation.resource.scheduler.infra.feign.algorithm.fallback.VideoFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/feign/WebServerClient.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/WebServerClient.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.scheduler.domain.feign;
+package com.css.simulation.resource.scheduler.infra.feign.algorithm;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.ProjectDetailsVO;
-import com.css.simulation.resource.scheduler.domain.feign.fallback.WebServerClientFallBack;
+import com.css.simulation.resource.scheduler.infra.feign.algorithm.fallback.WebServerClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/feign/fallback/VideoFeignClientFallBack.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/fallback/VideoFeignClientFallBack.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.domain.feign.fallback;
+package com.css.simulation.resource.scheduler.infra.feign.algorithm.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.scheduler.domain.feign.VideoFeignClient;
+import com.css.simulation.resource.scheduler.infra.feign.algorithm.VideoFeignClient;
 import org.springframework.stereotype.Component;
 
 

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/feign/fallback/WebServerClientFallBack.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/feign/algorithm/fallback/WebServerClientFallBack.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.scheduler.domain.feign.fallback;
+package com.css.simulation.resource.scheduler.infra.feign.algorithm.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.ProjectDetailsVO;
-import com.css.simulation.resource.scheduler.domain.feign.WebServerClient;
+import com.css.simulation.resource.scheduler.infra.feign.algorithm.WebServerClient;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/fs/minio/MinioUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/fs/minio/MinioUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.fs.minio;
+package com.css.simulation.resource.scheduler.infra.fs.minio;
 
 import io.minio.*;
 import io.minio.errors.*;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mq/kafka/KafkaUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/mq/kafka/KafkaUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mq.kafka;
+package com.css.simulation.resource.scheduler.infra.mq.kafka;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mq/kafka/consumer/ProjectConsumer.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/mq/kafka/consumer/ProjectConsumer.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mq.kafka.consumer;
+package com.css.simulation.resource.scheduler.infra.mq.kafka.consumer;
 
 
 import api.common.util.JsonUtil;

+ 1 - 1
simulation-resource-scheduler/src/main/resources/mysql/mapper/AlgorithmExpandMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.AlgorithmExpandMapper">
+<mapper namespace="com.css.simulation.resource.scheduler.infra.db.mysql.mapper.AlgorithmExpandMapper">
 
 
     <update id="updateStatusByAlgorithmId">

+ 1 - 1
simulation-resource-scheduler/src/main/resources/mysql/mapper/ScoringRulesMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.ScoringRulesMapper">
+<mapper namespace="com.css.simulation.resource.scheduler.infra.db.mysql.mapper.ScoringRulesMapper">
 
 
     <select id="selectRuleNameByRulesId" resultType="java.lang.String">

+ 1 - 1
simulation-resource-scheduler/src/main/resources/mysql/mapper/SimulationAutomaticProjectMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.SimulationAutomaticProjectMapper">
+<mapper namespace="com.css.simulation.resource.scheduler.infra.db.mysql.mapper.SimulationAutomaticProjectMapper">
 
 
     <select id="selectAlgorithmTypeById" resultType="java.lang.String">

+ 1 - 1
simulation-resource-scheduler/src/main/resources/mysql/mapper/SimulationAutomaticSubprojectMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.SimulationAutomaticSubprojectMapper">
+<mapper namespace="com.css.simulation.resource.scheduler.infra.db.mysql.mapper.SimulationAutomaticSubprojectMapper">
 
     <select id="selectParentIdById" resultType="java.lang.String">
         select parent_id from simulation.simulation_automatic_subproject

+ 1 - 1
simulation-resource-scheduler/src/main/resources/mysql/mapper/SimulationManualProjectMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.SimulationManualProjectMapper">
+<mapper namespace="com.css.simulation.resource.scheduler.infra.db.mysql.mapper.SimulationManualProjectMapper">
 
 
     <select id="selectAlgorithmTypeById" resultType="java.lang.String">

+ 1 - 1
simulation-resource-scheduler/src/main/resources/mysql/mapper/SimulationManualProjectTaskMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.SimulationManualProjectTaskMapper">
+<mapper namespace="com.css.simulation.resource.scheduler.infra.db.mysql.mapper.SimulationManualProjectTaskMapper">
 
 
     <update id="updateSuccessState">