LingxinMeng 2 лет назад
Родитель
Сommit
7cd4b3bfc4
100 измененных файлов с 209 добавлено и 209 удалено
  1. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/AlgoPlatformService.java
  2. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/FileDownService.java
  3. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/KafkaService.java
  4. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/MonitorService.java
  5. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/OauthClientService.java
  6. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/RedisService.java
  7. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/SceneService.java
  8. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/SchedulerService.java
  9. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/personal_information/UserInfoController.java
  10. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/accident/SceneAccidentController.java
  11. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/general/SceneGeneralController.java
  12. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/natural/SceneNaturalController.java
  13. 4 4
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/scene_test_package/SceneTestPackageController.java
  14. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/score_rule/ScoreRuleController.java
  15. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/standard/SceneStandardsController.java
  16. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/account_manage/RoleController.java
  17. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/scene_package_manage/ScenePackageController.java
  18. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/scene_upload/SceneUploadController.java
  19. 6 6
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/AlgorithmServiceImpl.java
  20. 7 7
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/SimulationProjectServiceImpl.java
  21. 3 3
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/CameraService.java
  22. 4 4
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ClusterService.java
  23. 6 6
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ConfigService.java
  24. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/DictService.java
  25. 4 4
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/GpsService.java
  26. 6 6
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/HomePageService.java
  27. 3 3
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/LidarService.java
  28. 5 5
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/LogService.java
  29. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/MenuService.java
  30. 3 3
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/OgtService.java
  31. 4 4
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ParameterService.java
  32. 3 3
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/RoleService.java
  33. 5 5
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneAccidentService.java
  34. 5 5
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneGeneralExampleService.java
  35. 5 5
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneGeneralTemplateService.java
  36. 4 4
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneImportService.java
  37. 6 6
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneNaturalService.java
  38. 3 3
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ScenePackageService.java
  39. 5 5
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneStandardsService.java
  40. 3 3
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ScoringRulesService.java
  41. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SystemScenePackageService.java
  42. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SystemUserSceneService.java
  43. 6 6
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/UserService.java
  44. 4 4
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/VehicleService.java
  45. 5 5
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/VehicleTempService.java
  46. 4 4
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/domain/service/ProjectDomainService.java
  47. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/domain/service/UserDomainService.java
  48. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/enums/ProjectRunStateEnum.java
  49. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/enums/SceneTypeEnum.java
  50. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/ApacheKafkaUtil.java
  51. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/AuthUtil.java
  52. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/PageUtil.java
  53. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/PdfBuilder.java
  54. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/PoUtil.java
  55. 9 9
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/ProjectUtil.java
  56. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/SceneUtil.java
  57. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/VehicleUtil.java
  58. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/FeignConfiguration.java
  59. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/LogAdvice.java
  60. 3 3
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/OAuth2Configuration.java
  61. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/TransactionConfiguration.java
  62. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/git/GitConfiguration.java
  63. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/kafka/KafkaAdminConfiguration.java
  64. 2 2
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/AuthorityCheck.java
  65. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/AuthorizationHolder.java
  66. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/MyUserAuthenticationConverter.java
  67. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/MyUserDetails.java
  68. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/OauthParameter.java
  69. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/sms/SmsConfiguration.java
  70. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/entity/SimulationAutomaticProjectEntity.java
  71. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/entity/SimulationAutomaticSubprojectEntity.java
  72. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/entity/SimulationManualProjectEntity.java
  73. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/entity/SystemUserEntity.java
  74. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/AlgorithmExpandMapper.java
  75. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/AlgorithmMapper.java
  76. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/AutoSubProjectMapper.java
  77. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/CameraMapper.java
  78. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/ClusterMapper.java
  79. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/ConfigMapper.java
  80. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/DictMapper.java
  81. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/GpsMapper.java
  82. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/HomePageMapper.java
  83. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/LidarMapper.java
  84. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/LogMapper.java
  85. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/ManualProjectMapper.java
  86. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/MenuMapper.java
  87. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/ModelConfigMapper.java
  88. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/ModelVehicleMapper.java
  89. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/OgtMapper.java
  90. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/ParameterMapper.java
  91. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/RelationConfigSensorMapper.java
  92. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/RoleMapper.java
  93. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneAccidentMapper.java
  94. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneGeneralDataMapper.java
  95. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneGeneralExampleMapper.java
  96. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneGeneralTemplateMapper.java
  97. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneImportMapper.java
  98. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneNaturalMapper.java
  99. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/ScenePackageMapper.java
  100. 1 1
      simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/ScenePackageSublistMapper.java

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/AlgoPlatformService.java

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

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/FileDownService.java

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

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/KafkaService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.acl;
 
 
 import api.common.pojo.param.KafkaParameter;
-import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
 import com.css.simulation.resource.server.acl.impl.KafkaServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/MonitorService.java

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

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/OauthClientService.java

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

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/RedisService.java

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

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/SceneService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.system.SceneImportPO;
-import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
 import com.css.simulation.resource.server.acl.impl.SceneServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/SchedulerService.java

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

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

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

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

@@ -8,7 +8,7 @@ import api.common.pojo.po.scene.SceneAccidentPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneAccidentVO;
 import api.common.util.CollectionUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
 import com.css.simulation.resource.server.application.service.SceneAccidentService;
 import com.css.simulation.resource.server.application.service.SceneImportService;
 import com.github.pagehelper.PageInfo;

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

@@ -11,7 +11,7 @@ import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.application.service.LogService;
 import com.css.simulation.resource.server.application.service.SceneGeneralExampleService;

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

@@ -9,7 +9,7 @@ import api.common.pojo.po.scene.SceneNaturalPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneNaturalVO;
 import api.common.util.CollectionUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
 import com.css.simulation.resource.server.application.service.SceneNaturalService;
 import com.css.simulation.resource.server.application.service.SceneImportService;
 import com.github.pagehelper.PageInfo;

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

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

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

@@ -8,8 +8,8 @@ import api.common.pojo.vo.scene.ScoringRulesVO;
 import api.common.util.ObjectUtil;
 import api.common.util.PythonUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
 import com.css.simulation.resource.server.application.service.ScoringRulesService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;

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

@@ -8,7 +8,7 @@ import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.StandardsRegulationsVO;
 import api.common.util.CollectionUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
 import com.css.simulation.resource.server.application.service.SceneStandardsService;
 import com.css.simulation.resource.server.application.service.SceneImportService;
 import com.github.pagehelper.PageInfo;

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

@@ -7,7 +7,7 @@ import api.common.pojo.vo.system.RoleVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.server.application.service.RoleService;
 import com.css.simulation.resource.server.domain.service.UserDomainService;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -9,7 +9,7 @@ import api.common.pojo.po.scene.SystemScenePackagePO;
 import api.common.pojo.vo.scene.SystemScenePackageVO;
 import api.common.pojo.vo.scene.SystemUserSceneVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
 import com.css.simulation.resource.server.application.service.SystemScenePackageService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;

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

@@ -5,7 +5,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.system.SceneImportPageParam;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infrastructure.common.oauth.AuthorizationHolder;
+import com.css.simulation.resource.server.infra.configuration.oauth.AuthorizationHolder;
 import com.css.simulation.resource.server.acl.SceneService;
 import com.css.simulation.resource.server.application.service.SceneImportService;
 import com.github.pagehelper.PageInfo;

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

@@ -17,12 +17,12 @@ import com.css.simulation.resource.server.application.service.AlgorithmService;
 import com.css.simulation.resource.server.application.service.DictService;
 import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.domain.service.UserDomainService;
-import com.css.simulation.resource.server.infrastructure.common.configuration.git.GitConfiguration;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PoUtil;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.AlgorithmExpandMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.AlgorithmMapper;
+import com.css.simulation.resource.server.infra.configuration.git.GitConfiguration;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.AlgorithmExpandMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.AlgorithmMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;

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

@@ -22,19 +22,19 @@ import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.vo.project.*;
 import api.common.util.*;
 import com.css.simulation.resource.server.domain.service.UserDomainService;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.*;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.*;
 import com.css.simulation.resource.server.application.service.AlgorithmService;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.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.infrastructure.common.enums.ProjectRunStateEnum;
-import com.css.simulation.resource.server.infrastructure.common.enums.SceneTypeEnum;
+import com.css.simulation.resource.server.infra.common.enums.ProjectRunStateEnum;
+import com.css.simulation.resource.server.infra.common.enums.SceneTypeEnum;
 import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
-import com.css.simulation.resource.server.infrastructure.common.util.PdfBuilder;
+import com.css.simulation.resource.server.infra.common.util.PdfBuilder;
 import com.css.simulation.resource.server.application.service.DictService;
-import com.css.simulation.resource.server.infrastructure.common.util.ProjectUtil;
+import com.css.simulation.resource.server.infra.common.util.ProjectUtil;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.ImmutableMap;
 import com.itextpdf.text.*;

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

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

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

@@ -7,10 +7,10 @@ import api.common.pojo.po.system.ClusterPO;
 import api.common.pojo.vo.system.ClusterVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PoUtil;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ClusterMapper;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.ClusterMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

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

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

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

@@ -7,7 +7,7 @@ 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.infrastructure.db.mysql.mapper.DictMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.DictMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

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

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

@@ -10,13 +10,13 @@ import api.common.pojo.vo.home.SystemServerVO;
 import api.common.util.NumberUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
 import com.css.simulation.resource.server.acl.OauthClientService;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.HomePageMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.LogMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SimulationManualProjectTaskMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemUserMapper;
+import com.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;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemUserMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

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

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

@@ -19,11 +19,11 @@ import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.LogMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemUserMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.VehicleTempMapper;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.LogMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemUserMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.VehicleTempMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

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

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

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

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

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

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

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

@@ -6,9 +6,9 @@ import api.common.pojo.po.system.RolePO;
 import api.common.pojo.vo.system.RoleVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PoUtil;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.RoleMapper;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.RoleMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -10,12 +10,12 @@ import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneAccidentMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageSublistMapper;
+import com.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;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;

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

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

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

@@ -13,11 +13,11 @@ import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateMbVO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneGeneralTemplateMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneGeneralTemplateMapper;
+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.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

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

@@ -9,10 +9,10 @@ import api.common.util.CollectionUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PoUtil;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneImportMapper;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneImportMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

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

@@ -10,13 +10,13 @@ import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneNaturalMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageSublistMapper;
+import com.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;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemScenePackageMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.util.StringUtil;

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

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

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

@@ -10,12 +10,12 @@ import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SceneStandardsRegulationsMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemScenePackageSublistMapper;
+import com.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;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;

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

@@ -5,9 +5,9 @@ import api.common.pojo.po.scene.ScoringRulesPO;
 import api.common.util.LogUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScoringRulesMapper;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.ScoringRulesMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -12,8 +12,8 @@ import api.common.util.CollectionUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.*;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.*;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

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

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

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

@@ -11,12 +11,12 @@ import api.common.util.EncryptUtil;
 import api.common.util.JsonUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infrastructure.common.oauth.OauthParameter;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.PoUtil;
-import com.css.simulation.resource.server.infrastructure.common.configuration.sms.SmsConfiguration;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SystemUserMapper;
+import com.css.simulation.resource.server.infra.configuration.oauth.OauthParameter;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.configuration.sms.SmsConfiguration;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemUserMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import org.springframework.kafka.core.KafkaTemplate;

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

@@ -7,11 +7,11 @@ import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelConfigMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.VehicleMapper;
-import com.css.simulation.resource.server.infrastructure.common.util.VehicleUtil;
+import com.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.common.util.VehicleUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

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

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

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

@@ -10,10 +10,10 @@ 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.application.service.job_manage.SimulationProjectService;
-import com.css.simulation.resource.server.infrastructure.db.entity.SimulationAutomaticProjectEntity;
-import com.css.simulation.resource.server.infrastructure.db.entity.SimulationAutomaticSubprojectEntity;
-import com.css.simulation.resource.server.infrastructure.db.entity.SimulationManualProjectEntity;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.*;
+import com.css.simulation.resource.server.infra.db.entity.SimulationAutomaticProjectEntity;
+import com.css.simulation.resource.server.infra.db.entity.SimulationAutomaticSubprojectEntity;
+import com.css.simulation.resource.server.infra.db.entity.SimulationManualProjectEntity;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;

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

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

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

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

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

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

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

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

+ 2 - 2
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/util/AuthUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/AuthUtil.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.server.infrastructure.common.util;
+package com.css.simulation.resource.server.infra.common.util;
 
-import com.css.simulation.resource.server.infrastructure.common.oauth.MyUserDetails;
+import com.css.simulation.resource.server.infra.configuration.oauth.MyUserDetails;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/util/PageUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/PageUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.common.util;
+package com.css.simulation.resource.server.infra.common.util;
 
 import api.common.pojo.common.PageVO;
 import com.github.pagehelper.PageHelper;

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

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

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/util/PoUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/PoUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.common.util;
+package com.css.simulation.resource.server.infra.common.util;
 
 import api.common.pojo.common.CommonPO;
 import api.common.pojo.constants.DictConstants;

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

@@ -1,18 +1,18 @@
-package com.css.simulation.resource.server.infrastructure.common.util;
+package com.css.simulation.resource.server.infra.common.util;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.po.project.SimulationManualProjectPO;
 import api.common.pojo.po.scheduler.SchedulerProjectPO;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.AlgorithmMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelConfigMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ModelVehicleMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.AutoSubProjectMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ManualProjectMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.SimulationManualProjectMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.AlgorithmMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.ModelVehicleMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.AutoSubProjectMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.ManualProjectMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SimulationManualProjectMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageSublistMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

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

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

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

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

+ 2 - 2
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/configuration/FeignConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/FeignConfiguration.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.infrastructure.common.configuration;
+package com.css.simulation.resource.server.infra.configuration;
 
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infrastructure.common.oauth.AuthorizationHolder;
+import com.css.simulation.resource.server.infra.configuration.oauth.AuthorizationHolder;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;

+ 2 - 2
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/configuration/LogAdvice.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/LogAdvice.java

@@ -1,10 +1,10 @@
-package com.css.simulation.resource.server.infrastructure.common.configuration;
+package com.css.simulation.resource.server.infra.configuration;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.log.LogOperationPO;
 import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
 import com.css.simulation.resource.server.application.service.LogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;

+ 3 - 3
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/configuration/OAuth2Configuration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/OAuth2Configuration.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.infrastructure.common.configuration;
+package com.css.simulation.resource.server.infra.configuration;
 
-import com.css.simulation.resource.server.infrastructure.common.oauth.MyUserAuthenticationConverter;
-import com.css.simulation.resource.server.infrastructure.common.oauth.OauthParameter;
+import com.css.simulation.resource.server.infra.configuration.oauth.MyUserAuthenticationConverter;
+import com.css.simulation.resource.server.infra.configuration.oauth.OauthParameter;
 import lombok.SneakyThrows;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/configuration/TransactionConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/TransactionConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.common.configuration;
+package com.css.simulation.resource.server.infra.configuration;
 
 import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;

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

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

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

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

+ 2 - 2
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/oauth/AuthorityCheck.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/AuthorityCheck.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.infrastructure.common.oauth;
+package com.css.simulation.resource.server.infra.configuration.oauth;
 
 import api.common.pojo.constants.DictConstants;
-import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.common.util.AuthUtil;
 import org.springframework.stereotype.Component;
 
 @Component("AuthorityCheck")

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/oauth/AuthorizationHolder.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/AuthorizationHolder.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.common.oauth;
+package com.css.simulation.resource.server.infra.configuration.oauth;
 
 import org.springframework.core.NamedInheritableThreadLocal;
 

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/oauth/MyUserAuthenticationConverter.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/MyUserAuthenticationConverter.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infrastructure.common.oauth;
+package com.css.simulation.resource.server.infra.configuration.oauth;
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/oauth/MyUserDetails.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/MyUserDetails.java

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

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/oauth/OauthParameter.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/OauthParameter.java

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

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/configuration/sms/SmsConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/sms/SmsConfiguration.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Некоторые файлы не были показаны из-за большого количества измененных файлов