算法平台

simulation-resource-common/src/main/java/com/css/simulation/resource/common/application/algorithm/AlgorithmExpandApplication.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.common.application.algorithm;
 
 import api.common.pojo.common.ResponseBodyVO;
 import com.css.simulation.resource.common.acl.algorithm.AlgorithmExpandAcl;
-import com.css.simulation.resource.common.domain.algorithm.AlgorithmExpandDomain;
+import com.css.simulation.resource.common.domain.service.algorithm.AlgorithmExpandDomainService;
 import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +16,7 @@ public class AlgorithmExpandApplication {
     private AlgorithmExpandAcl algorithmExpandAcl;
 
     @Resource
-    private AlgorithmExpandDomain algorithmExpandDomain;
+    private AlgorithmExpandDomainService algorithmExpandDomainService;
 
     /**
      * String urlParam = "";
@@ -44,7 +44,7 @@ public class AlgorithmExpandApplication {
         //1 获取第三方算法平台列表
         final ResponseBodyVO<String> algorithmList = algorithmExpandAcl.getAlgorithmList(param);
         //2 检查仿真平台数据库中是否有该算法，没有则添加，同时设置状态为”未测试“
-        algorithmExpandDomain.checkIsExisted(algorithmList);
+        algorithmExpandDomainService.checkIsExisted(algorithmList);
         return algorithmList;
     }
 

simulation-resource-common/src/main/java/com/css/simulation/resource/common/domain/algorithm/AlgorithmExpandDomain.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/domain/service/algorithm/AlgorithmExpandDomainService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.domain.algorithm;
+package com.css.simulation.resource.common.domain.service.algorithm;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -18,7 +18,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-public class AlgorithmExpandDomain {
+public class AlgorithmExpandDomainService {
 
     @Resource
     private AlgorithmExpandMapper algorithmExpandMapper;

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

@@ -3,7 +3,7 @@ package com.css.simulation.resource.server.api.controller;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.DictParam;
 import api.common.pojo.vo.system.DictVO;
-import com.css.simulation.resource.server.application.DictService;
+import com.css.simulation.resource.server.application.service.DictService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.vo.system.MenuVO;
-import com.css.simulation.resource.server.application.MenuService;
+import com.css.simulation.resource.server.application.service.MenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -4,7 +4,7 @@ package com.css.simulation.resource.server.api.controller.algorithm_library;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.algorithm.AlgorithmParameter;
-import com.css.simulation.resource.server.application.AlgorithmService;
+import com.css.simulation.resource.server.application.service.AlgorithmService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -6,12 +6,12 @@ import api.common.pojo.vo.home.HardwareVO;
 import api.common.pojo.vo.home.LineChartVO;
 import api.common.pojo.vo.home.ServiceVO;
 import api.common.pojo.vo.home.SystemServerVO;
-import com.css.simulation.resource.server.application.AlgorithmService;
-import com.css.simulation.resource.server.application.HomePageService;
-import com.css.simulation.resource.server.application.ConfigService;
-import com.css.simulation.resource.server.application.SimulationProjectService;
-import com.css.simulation.resource.server.application.SceneNaturalService;
-import com.css.simulation.resource.server.application.ClusterService;
+import com.css.simulation.resource.server.application.service.AlgorithmService;
+import com.css.simulation.resource.server.application.service.HomePageService;
+import com.css.simulation.resource.server.application.service.ConfigService;
+import com.css.simulation.resource.server.application.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.SceneNaturalService;
+import com.css.simulation.resource.server.application.service.ClusterService;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;

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

@@ -5,7 +5,7 @@ import api.common.pojo.vo.project.ProjectReportVO;
 import api.common.pojo.vo.project.ProjectResultWithAlgorithmVO;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.server.api.parameter.ProjectParam;
-import com.css.simulation.resource.server.application.job_manage.JobManageApplication;
+import com.css.simulation.resource.server.application.service.job_manage.JobManageApplication;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -5,8 +5,8 @@ import api.common.pojo.param.project.DictParam;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.*;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.application.SimulationProjectService;
-import com.css.simulation.resource.server.application.ClusterService;
+import com.css.simulation.resource.server.application.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.ClusterService;
 import com.github.pagehelper.PageInfo;
 
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -3,7 +3,7 @@ package com.css.simulation.resource.server.api.controller.job_manage;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.SimulationProjectService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -9,7 +9,7 @@ import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.VehicleService;
+import com.css.simulation.resource.server.application.service.VehicleService;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

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

@@ -4,7 +4,7 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.model.VehiclePageParam;
 import api.common.pojo.po.model.VehicleTempPO;
 import api.common.pojo.vo.model.VehicleTempVO;
-import com.css.simulation.resource.server.application.VehicleTempService;
+import com.css.simulation.resource.server.application.service.VehicleTempService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;

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

@@ -6,7 +6,7 @@ import api.common.pojo.param.model.CameraParam;
 import api.common.pojo.po.model.CameraPO;
 import api.common.pojo.vo.model.CameraVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.CameraService;
+import com.css.simulation.resource.server.application.service.CameraService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -7,10 +7,10 @@ import api.common.pojo.param.model.LidarParam;
 import api.common.pojo.param.model.OgtParam;
 import api.common.pojo.vo.model.SensorNewVO;
 import api.common.pojo.vo.model.SensorVO;
-import com.css.simulation.resource.server.application.CameraService;
-import com.css.simulation.resource.server.application.GpsService;
-import com.css.simulation.resource.server.application.LidarService;
-import com.css.simulation.resource.server.application.OgtService;
+import com.css.simulation.resource.server.application.service.CameraService;
+import com.css.simulation.resource.server.application.service.GpsService;
+import com.css.simulation.resource.server.application.service.LidarService;
+import com.css.simulation.resource.server.application.service.OgtService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -7,7 +7,7 @@ import api.common.pojo.param.model.GpsParam;
 import api.common.pojo.po.model.GpsPO;
 import api.common.pojo.vo.model.GpsVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.GpsService;
+import com.css.simulation.resource.server.application.service.GpsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -7,7 +7,7 @@ import api.common.pojo.param.model.LidarParam;
 import api.common.pojo.po.model.LidarPO;
 import api.common.pojo.vo.model.LidarVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.LidarService;
+import com.css.simulation.resource.server.application.service.LidarService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -6,7 +6,7 @@ import api.common.pojo.param.model.OgtParam;
 import api.common.pojo.po.model.OgtPO;
 import api.common.pojo.vo.model.OgtVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.OgtService;
+import com.css.simulation.resource.server.application.service.OgtService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -8,7 +8,7 @@ import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.vo.model.ConfigSensorVO;
 import api.common.pojo.vo.model.ConfigVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.ConfigService;
+import com.css.simulation.resource.server.application.service.ConfigService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

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

@@ -12,10 +12,10 @@ import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
-import com.css.simulation.resource.server.application.SystemScenePackageService;
-import com.css.simulation.resource.server.application.ClusterService;
-import com.css.simulation.resource.server.application.ParameterService;
-import com.css.simulation.resource.server.application.UserService;
+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;
+import com.css.simulation.resource.server.application.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -9,8 +9,8 @@ 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.utils.PageUtil;
-import com.css.simulation.resource.server.application.SceneAccidentService;
-import com.css.simulation.resource.server.application.SceneImportService;
+import com.css.simulation.resource.server.application.service.SceneAccidentService;
+import com.css.simulation.resource.server.application.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -13,11 +13,11 @@ import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.acl.feign.FileDownService;
-import com.css.simulation.resource.server.application.LogService;
-import com.css.simulation.resource.server.application.SceneGeneralExampleService;
-import com.css.simulation.resource.server.application.SceneGeneralTemplateService;
-import com.css.simulation.resource.server.application.DictService;
-import com.css.simulation.resource.server.application.SceneImportService;
+import com.css.simulation.resource.server.application.service.LogService;
+import com.css.simulation.resource.server.application.service.SceneGeneralExampleService;
+import com.css.simulation.resource.server.application.service.SceneGeneralTemplateService;
+import com.css.simulation.resource.server.application.service.DictService;
+import com.css.simulation.resource.server.application.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -10,8 +10,8 @@ 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.utils.PageUtil;
-import com.css.simulation.resource.server.application.SceneNaturalService;
-import com.css.simulation.resource.server.application.SceneImportService;
+import com.css.simulation.resource.server.application.service.SceneNaturalService;
+import com.css.simulation.resource.server.application.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -11,8 +11,8 @@ import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.application.ScenePackageService;
-import com.css.simulation.resource.server.application.ParameterService;
+import com.css.simulation.resource.server.application.service.ScenePackageService;
+import com.css.simulation.resource.server.application.service.ParameterService;
 import com.css.simulation.resource.server.infrastructure.util.SceneUtil;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;

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

@@ -10,7 +10,7 @@ import api.common.util.PythonUtil;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
-import com.css.simulation.resource.server.application.ScoringRulesService;
+import com.css.simulation.resource.server.application.service.ScoringRulesService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;

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

@@ -9,8 +9,8 @@ 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.utils.PageUtil;
-import com.css.simulation.resource.server.application.SceneStandardsService;
-import com.css.simulation.resource.server.application.SceneImportService;
+import com.css.simulation.resource.server.application.service.SceneStandardsService;
+import com.css.simulation.resource.server.application.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -5,7 +5,7 @@ import api.common.pojo.param.system.RoleParam;
 import api.common.pojo.po.system.RolePO;
 import api.common.pojo.vo.system.RoleVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.RoleService;
+import com.css.simulation.resource.server.application.service.RoleService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -5,7 +5,7 @@ import api.common.pojo.param.system.UserParam;
 import api.common.pojo.po.system.UserPO;
 import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.UserService;
+import com.css.simulation.resource.server.application.service.UserService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

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

@@ -5,7 +5,7 @@ import api.common.pojo.param.system.ClusterParam;
 import api.common.pojo.po.system.ClusterPO;
 import api.common.pojo.vo.system.ClusterVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.ClusterService;
+import com.css.simulation.resource.server.application.service.ClusterService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -5,7 +5,7 @@ import api.common.pojo.param.log.LogPageParam;
 import api.common.pojo.po.log.LogLoginPO;
 import api.common.pojo.po.log.LogOperationPO;
 import api.common.pojo.po.log.LogSystemPO;
-import com.css.simulation.resource.server.application.LogService;
+import com.css.simulation.resource.server.application.service.LogService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

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

@@ -5,7 +5,7 @@ import api.common.pojo.param.system.ParameterParam;
 import api.common.pojo.po.system.ParameterPO;
 import api.common.pojo.vo.system.ParameterVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.ParameterService;
+import com.css.simulation.resource.server.application.service.ParameterService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -10,7 +10,7 @@ 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.utils.PageUtil;
-import com.css.simulation.resource.server.application.SystemScenePackageService;
+import com.css.simulation.resource.server.application.service.SystemScenePackageService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.api.controller.system_manage.scene_pa
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.scene.SystemUserScenePO;
-import com.css.simulation.resource.server.application.SystemUserSceneService;
+import com.css.simulation.resource.server.application.service.SystemUserSceneService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;

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

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

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

@@ -13,9 +13,9 @@ import api.common.util.*;
 import com.css.simulation.resource.server.acl.feign.AlgoPlatformService;
 import com.css.simulation.resource.server.acl.feign.FileDownService;
 import com.css.simulation.resource.server.acl.feign.SchedulerService;
-import com.css.simulation.resource.server.application.AlgorithmService;
-import com.css.simulation.resource.server.application.DictService;
-import com.css.simulation.resource.server.application.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.AlgorithmService;
+import com.css.simulation.resource.server.application.service.DictService;
+import com.css.simulation.resource.server.application.service.SimulationProjectService;
 import com.css.simulation.resource.server.infrastructure.common.configuration.git.GitConfiguration;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;

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

@@ -21,8 +21,9 @@ import api.common.pojo.po.project.*;
 import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.vo.project.*;
 import api.common.util.*;
+import com.css.simulation.resource.server.domain.service.UserDomainService;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.*;
-import com.css.simulation.resource.server.application.AlgorithmService;
+import com.css.simulation.resource.server.application.service.AlgorithmService;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.acl.feign.AlgoPlatformService;
@@ -30,9 +31,9 @@ import com.css.simulation.resource.server.acl.feign.FileDownService;
 import com.css.simulation.resource.server.acl.feign.MonitorService;
 import com.css.simulation.resource.server.infrastructure.enums.ProjectRunStateEnum;
 import com.css.simulation.resource.server.infrastructure.enums.SceneTypeEnum;
-import com.css.simulation.resource.server.application.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.SimulationProjectService;
 import com.css.simulation.resource.server.infrastructure.util.PdfBuilder;
-import com.css.simulation.resource.server.application.DictService;
+import com.css.simulation.resource.server.application.service.DictService;
 import com.css.simulation.resource.server.infrastructure.util.ProjectUtil;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.ImmutableMap;
@@ -105,6 +106,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     private ProjectUtil projectUtil;
     @Resource
     private VehicleMapper vehicleMapper;
+    @Resource
+    private UserDomainService userDomainService;
 
     // * -------------------------------- Comment --------------------------------
 
@@ -1555,6 +1558,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
      */
     private List<DropDownVo> getOtherAlgorithmInfo(String query) {
 
+        //1 判断用户是否是管理员
+        final boolean admin = userDomainService.isAdmin(AuthUtil.getCurrentUserId(), AuthUtil.getCurrentUserRoleCode());
+
         List<DropDownVo> algorithmList = new ArrayList<>();
 
         ResponseBodyVO<String> algorithmBody = algoPlatformService.getAlgorithmList(query);
@@ -1566,11 +1572,26 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         Integer totalElements = (Integer) dataMap.get("totalElements");
         if (totalElements > 0) {
             for (Map<String, String> content : contentList) {
-                DropDownVo dropDownVo = new DropDownVo();
-                dropDownVo.setId(content.get("algorithmId"));
-                dropDownVo.setName(content.get("algorithmName"));
-                dropDownVo.setDescription(content.get("description"));
-                algorithmList.add(dropDownVo);
+                final String teamName = content.get("teamName");
+                final String algorithmId = content.get("algorithmId");
+                final String algorithmName = content.get("algorithmName");
+                final String evaluationName = content.get("evaluationName");    // 算法版本号
+                final String description = content.get("description");
+                if (StringUtil.isNotEmpty(teamName)) {
+                    if (admin) {
+                        DropDownVo dropDownVo = new DropDownVo();
+                        dropDownVo.setId(algorithmId);
+                        dropDownVo.setName(algorithmName + "-" + evaluationName);
+                        dropDownVo.setDescription(description);
+                        algorithmList.add(dropDownVo);
+                    }
+                } else {
+                    DropDownVo dropDownVo = new DropDownVo();
+                    dropDownVo.setId(algorithmId);
+                    dropDownVo.setName(algorithmName);
+                    dropDownVo.setDescription(description);
+                    algorithmList.add(dropDownVo);
+                }
             }
         }
         return algorithmList;
@@ -4005,7 +4026,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     @Override
     public String selectLastProjectIdByAlgorithmId(String algorithmId) {
-        return  simulationProjectMapper.selectLastProjectIdByAlgorithmId(algorithmId);
+        return simulationProjectMapper.selectLastProjectIdByAlgorithmId(algorithmId);
     }
 
     @Override

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.algorithm.AlgorithmParameter;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.CameraParam;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.*;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.GpsParam;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.common.PageVO;
 import api.common.pojo.common.ResponseBodyVO;
@@ -16,7 +16,7 @@ import com.css.simulation.resource.server.acl.feign.OauthClientService;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.HomePageMapper;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.LogMapper;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.SimulationProjectTaskMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.UserMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -37,7 +37,7 @@ public class HomePageService {
     @Resource
     private SimulationProjectTaskMapper simulationProjectTaskMapper;
     @Resource
-    private UserMapper userMapper;
+    private SystemUserMapper systemUserMapper;
 
     @Resource
     private LogMapper logMapper;
@@ -86,7 +86,7 @@ public class HomePageService {
         //2 查询自动运行任务 -> 子项目 -> 父项目 -> 车辆配置 -> 车辆模型 -> 模型类型
         int dynamicsLicenseNumber = simulationProjectTaskMapper.selectTaskNumberOfCarsim();
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, ServiceVO.builder()
-                .userNumber(userMapper.selectCount())
+                .userNumber(systemUserMapper.selectCount())
                 .onlineNumber(onlineNumber)
                 .simulationNodeNumber((int) count)
                 .simulationLicenseNumber(homePageMapper.selectSimulationLicenseNumber())

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.LidarParam;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -22,7 +22,7 @@ import api.common.util.TimeUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.LogMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.UserMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserMapper;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.VehicleTempMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.scheduling.annotation.Async;
@@ -44,7 +44,7 @@ public class LogService {
     private DictService dictService;
 
     @Resource
-    private UserMapper userMapper;
+    private SystemUserMapper systemUserMapper;
 
     @Resource
     private VehicleTempMapper vehicleTempMapper;
@@ -116,7 +116,7 @@ public class LogService {
             String userId = userPO.getId();
             String username = userPO.getUsername();
             if (ObjectUtil.isNull(username)) {
-                UserVO userVO = userMapper.getUserInfo(userId);
+                UserVO userVO = systemUserMapper.getUserInfo(userId);
                 username = userVO.getUsername();
             }
             String content = username + " ( ID: " + userId + " )";

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.vo.system.MenuVO;
 import api.common.util.ObjectUtil;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 
 import api.common.pojo.constants.DictConstants;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -10,7 +10,6 @@ import api.common.util.StringUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
-import com.css.simulation.resource.server.application.LogService;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.ParameterMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.vo.project.ProjectReportVO;
 import org.springframework.stereotype.Service;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.param.system.RoleParam;
 import api.common.pojo.po.system.RoleMenuPO;

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 
 import api.common.pojo.common.ResponseBodyVO;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 
 import api.common.pojo.constants.DictConstants;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.ScenePackageParam;

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.param.scene.ScoringRulesParam;
 import api.common.pojo.po.scene.ScoringRulesPO;

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 
 import api.common.pojo.po.scene.SystemUserScenePO;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -16,7 +16,7 @@ import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
 import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
 import com.css.simulation.resource.server.infrastructure.common.configuration.sms.SmsConfiguration;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.UserMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import org.springframework.kafka.core.KafkaTemplate;
@@ -32,7 +32,7 @@ import java.util.Map;
 public class UserService {
 
     @Resource
-    UserMapper userMapper;
+    SystemUserMapper systemUserMapper;
     @Resource
     OauthParameter oauthParameter;
     @Resource
@@ -48,7 +48,7 @@ public class UserService {
 
     public UserVO getCurrentUserInfo() {
         String userId = AuthUtil.getCurrentUserId();
-        UserVO userVO = userMapper.getUserInfo(userId);
+        UserVO userVO = systemUserMapper.getUserInfo(userId);
         //字典翻译
         Map<String, Map<String, String>> dictMaps = dictService.getDictMapsByTypes(DictConstants.USE_TYPE + "," + DictConstants.ROLE_CODE);
         userVO.setUseTypeName(dictMaps.get(DictConstants.USE_TYPE).get(userVO.getUseType()));
@@ -61,13 +61,13 @@ public class UserService {
         List<UserVO> list;
         String currentUserRoleCode = AuthUtil.getCurrentUserRoleCode();
         if (DictConstants.ROLE_CODE_SYSADMIN.equals(currentUserRoleCode)) {//超级管理员
-            list = userMapper.getUserPageLista(pageParam);
+            list = systemUserMapper.getUserPageLista(pageParam);
         } else if (DictConstants.ROLE_CODE_ADMIN.equals(currentUserRoleCode)) {//子管理员
-            list = userMapper.getUserPageListb(pageParam);
+            list = systemUserMapper.getUserPageListb(pageParam);
         } else if (DictConstants.ROLE_CODE_UESR.equals(currentUserRoleCode)) {//普通用户
             //只查询自己创建的子账户
             pageParam.setCreateUserId(AuthUtil.getCurrentUserId());
-            list = userMapper.getUserPageListc(pageParam);
+            list = systemUserMapper.getUserPageListc(pageParam);
         } else {
             return null;
         }
@@ -101,7 +101,7 @@ public class UserService {
                 int num = parameter.getNumCreateUser(); // 最大用户数
                 int subUserNum = 0;
                 String userId = AuthUtil.getCurrentUserId();
-                List<UserPO> subUsers = userMapper.getSubUser(userId);
+                List<UserPO> subUsers = systemUserMapper.getSubUser(userId);
                 if (ObjectUtil.isNotNull(subUsers)) {
                     subUserNum = subUsers.size();
                 }
@@ -117,7 +117,7 @@ public class UserService {
             return null;
         }
         //重名校验
-        List<UserPO> list = userMapper.checkUsername(userPO);
+        List<UserPO> list = systemUserMapper.checkUsername(userPO);
         if (ObjectUtil.isNotNull(list)) {
             userPO.setId("checkUsername");
             return userPO;
@@ -129,7 +129,7 @@ public class UserService {
             // 初始密码
             userPO.setPassword(EncryptUtil.getLowerMD5(oauthParameter.getSimulationDefaultPassword()));
             userPO.setVisible("1");
-            userMapper.insert(userPO);
+            systemUserMapper.insert(userPO);
             logService.logUser(LogConstants.SYS_LOG_USER_INSERT, userPO);
 
 
@@ -145,7 +145,7 @@ public class UserService {
             );
 
         } else {
-            userMapper.update(userPO);
+            systemUserMapper.update(userPO);
             logService.logUser(LogConstants.SYS_LOG_USER_UPDATE, userPO);
         }
         // 密码清空
@@ -157,7 +157,7 @@ public class UserService {
     public void saveDefaultPassword(UserPO userPO) {
         userPO.setPassword(EncryptUtil.getLowerMD5(oauthParameter.getSimulationDefaultPassword()));
         PoUtil.initUpdatePo(userPO);
-        userMapper.saveDefaultPassword(userPO);
+        systemUserMapper.saveDefaultPassword(userPO);
         logService.logUser(LogConstants.SYS_LOG_USER_RESET, userPO);
 
         // 发送短信
@@ -175,19 +175,19 @@ public class UserService {
 
     public void saveVisible(UserPO userPO) {
         PoUtil.initUpdatePo(userPO);
-        userMapper.saveVisible(userPO);
+        systemUserMapper.saveVisible(userPO);
         if ("1".equals(userPO.getVisible())) {
             logService.logUser(LogConstants.SYS_LOG_USER_START, userPO);
         } else { // 停用
-            UserVO userInfo = userMapper.getUserInfo(userPO.getId());
+            UserVO userInfo = systemUserMapper.getUserInfo(userPO.getId());
             String roleCode = userInfo.getRoleCode();
             if (DictConstants.ROLE_CODE_UESR.equals(roleCode)) {  // 停用普通用户时-停用子账户
-                List<UserPO> subUsers = userMapper.getSubUser(userPO.getId());
+                List<UserPO> subUsers = systemUserMapper.getSubUser(userPO.getId());
                 if (ObjectUtil.isNotNull(subUsers)) {
                     subUsers.forEach(po -> {
                         PoUtil.initUpdatePo(po);
                         po.setVisible("0");
-                        userMapper.saveVisible(po);
+                        systemUserMapper.saveVisible(po);
                     });
                 }
             }
@@ -199,13 +199,13 @@ public class UserService {
 
     public void savePhone(UserPO userPO) {
         PoUtil.initUpdatePo(userPO);
-        userMapper.savePhone(userPO);
+        systemUserMapper.savePhone(userPO);
     }
 
     public UserPO savePassword(UserVO userVO) throws NoSuchAlgorithmException {
         //确认原密码是否正确
         userVO.setPassword(EncryptUtil.getLowerMD5(userVO.getPassword()));
-        List<UserVO> list = userMapper.checkPassword(userVO);
+        List<UserVO> list = systemUserMapper.checkPassword(userVO);
         if (ObjectUtil.isNull(list)) {
             return null;
         }
@@ -214,7 +214,7 @@ public class UserService {
         userPO.setId(userVO.getId());
         userPO.setPassword(EncryptUtil.getLowerMD5(userVO.getNewPassword()));
         PoUtil.initUpdatePo(userPO);
-        userMapper.savePassword(userPO);
+        systemUserMapper.savePassword(userPO);
         return userPO;
     }
 }

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.VehicleParam;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application;
+package com.css.simulation.resource.server.application.service;
 
 import java.io.*;
 import java.util.HashMap;

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

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.application.job_manage;
+package com.css.simulation.resource.server.application.service.job_manage;
 
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.ProjectReportVO;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.domain.ProjectDomain;
+import com.css.simulation.resource.server.domain.service.ProjectDomainService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -13,30 +13,30 @@ import java.util.List;
 public class JobManageApplication {
 
     @Resource
-    private ProjectDomain projectDomain;
+    private ProjectDomainService projectDomainService;
 
     public ProjectReportVO getLastProjectReportByAlgorithmId(String algorithmId) {
         //1 获取最新的项目ID
-        String projectId = projectDomain.getLastProjectIdByAlgorithmId(algorithmId);
+        String projectId = projectDomainService.getLastProjectIdByAlgorithmId(algorithmId);
         if (StringUtil.isEmpty(projectId)) {
             throw new RuntimeException("该算法还未执行过项目。");
         }
-        String projectType = projectDomain.getProjectTypeByProjectId(projectId);
+        String projectType = projectDomainService.getProjectTypeByProjectId(projectId);
 
         //2 获取报告详情
-        return projectDomain.getProjectReport(SimulationManualProjectParam.builder()
+        return projectDomainService.getProjectReport(SimulationManualProjectParam.builder()
                 .id(projectId)
                 .projectType(projectType)
                 .build());
     }
 
     public List<String> getLastVideoListByAlgorithmId(String algorithmId) {
-        String projectId = projectDomain.getLastProjectIdByAlgorithmId(algorithmId);
+        String projectId = projectDomainService.getLastProjectIdByAlgorithmId(algorithmId);
         if (StringUtil.isEmpty(projectId)) {
             throw new RuntimeException("该算法还未执行过项目。");
         }
-        String projectType = projectDomain.getProjectTypeByProjectId(projectId);
-        return projectDomain.getVideoList(SimulationManualProjectParam.builder()
+        String projectType = projectDomainService.getProjectTypeByProjectId(projectId);
+        return projectDomainService.getVideoList(SimulationManualProjectParam.builder()
                 .id(projectId)
                 .projectType(projectType)
                 .build());

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.domain;
+package com.css.simulation.resource.server.domain.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -7,7 +7,7 @@ import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.po.project.SimulationManualProjectPO;
 import api.common.pojo.vo.project.ProjectReportVO;
 import com.css.simulation.resource.server.acl.feign.FileDownService;
-import com.css.simulation.resource.server.application.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.SimulationProjectService;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.SimulationProjectMapper;
 import com.css.simulation.resource.server.infrastructure.mysql.mapper.SimulationProjectTaskMapper;
 
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @org.springframework.stereotype.Service
-public class ProjectDomain {
+public class ProjectDomainService {
 
     @Resource
     private SimulationProjectService simulationProjectService;

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

@@ -0,0 +1,34 @@
+package com.css.simulation.resource.server.domain.service;
+
+import api.common.pojo.constants.DictConstants;
+import com.css.simulation.resource.server.infrastructure.entity.SystemUserEntity;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserMapper;
+
+import javax.annotation.Resource;
+
+@org.springframework.stereotype.Service
+public class UserDomainService {
+
+    @Resource
+    private SystemUserMapper systemUserMapper;
+
+    public boolean isAdmin(String userId, String roleCode) {
+        if (DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode) || DictConstants.ROLE_CODE_ADMIN.equals(roleCode)) {
+            return true;
+        } else if (DictConstants.ROLE_CODE_UESR.equals(roleCode)) {
+            return false;
+        } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
+            String parentUserId = systemUserMapper.selectCreateUserIdById(SystemUserEntity.builder().id(userId).build());
+            String parentRoleCode = systemUserMapper.selectRoleCodeById(SystemUserEntity.builder().id(parentUserId).build());
+            if (DictConstants.ROLE_CODE_SYSADMIN.equals(parentRoleCode) || DictConstants.ROLE_CODE_ADMIN.equals(parentRoleCode)) {
+                return true;
+            } else if (DictConstants.ROLE_CODE_UESR.equals(parentRoleCode)) {
+                return false;
+            } else {
+                throw new RuntimeException("未知用户" + parentUserId + "角色：" + roleCode);
+            }
+        } else {
+            throw new RuntimeException("未知用户" + userId + "角色：" + roleCode);
+        }
+    }
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/demo/service/TestService.java

@@ -5,7 +5,7 @@ import api.common.pojo.param.demo.TestPageParam;
 import api.common.pojo.vo.demo.TestVO;
 import com.css.simulation.resource.server.infrastructure.common.demo.mapper.TestMapper;
 import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
-import com.css.simulation.resource.server.application.DictService;
+import com.css.simulation.resource.server.application.service.DictService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

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

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/UserMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/SystemUserMapper.java

@@ -3,6 +3,7 @@ package com.css.simulation.resource.server.infrastructure.mysql.mapper;
 import api.common.pojo.param.system.UserParam;
 import api.common.pojo.po.system.UserPO;
 import api.common.pojo.vo.system.UserVO;
+import com.css.simulation.resource.server.infrastructure.entity.SystemUserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -11,7 +12,7 @@ import java.util.List;
 
 @Mapper
 @Repository
-public interface UserMapper {
+public interface SystemUserMapper {
 
     UserVO getUserInfo(@Param("userId") String userId);
 
@@ -41,4 +42,7 @@ public interface UserMapper {
 
     List<UserPO> getSubUser(@Param("createUserId") String createUserId);
 
+    String selectCreateUserIdById(SystemUserEntity build);
+
+    String selectRoleCodeById(SystemUserEntity build);
 }

simulation-resource-server/src/main/resources/mysql/mapper/UserMapper.xml → simulation-resource-server/src/main/resources/mysql/mapper/SystemUserMapper.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.server.infrastructure.mysql.mapper.UserMapper" >
+<mapper namespace="com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserMapper" >
 
 
     <select id="getUserInfo" parameterType="java.lang.String" resultType="api.common.pojo.vo.system.UserVO">
@@ -192,6 +192,12 @@
 
     <select id="getSubUser" parameterType="java.lang.String" resultType="api.common.pojo.po.system.UserPO">
         select * from system_user
-        where is_deleted = '0' AND create_user_id = #{createUserId,jdbcType=VARCHAR};
+        where is_deleted = '0' AND create_user_id = #{createUserId}
+    </select>
+    <select id="selectCreateUserIdById" resultType="java.lang.String">
+        select create_user_id from system_user where id = #{id}
+    </select>
+    <select id="selectRoleCodeById" resultType="java.lang.String">
+        select role_code from system_user where id = #{id}
     </select>
 </mapper>