算法平台

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

@@ -10,7 +10,7 @@ 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.utils.AuthUtil;
+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.application.service.SystemScenePackageService;
 import com.css.simulation.resource.server.application.service.ClusterService;

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.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.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;

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.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.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;

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.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.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;

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

@@ -8,8 +8,8 @@ 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.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+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.application.service.ScenePackageService;
 import com.css.simulation.resource.server.application.service.ParameterService;

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.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+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.application.service.ScoringRulesService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;

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.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.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;

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.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.common.util.PageUtil;
 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/application/impl/AlgorithmServiceImpl.java

@@ -18,9 +18,9 @@ import com.css.simulation.resource.server.application.service.DictService;
 import com.css.simulation.resource.server.application.service.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.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.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.github.pagehelper.PageHelper;

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

@@ -24,8 +24,8 @@ 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.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.infrastructure.common.util.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.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;

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

@@ -9,7 +9,7 @@ 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.utils.AuthUtil;
+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 org.springframework.stereotype.Service;

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

@@ -7,9 +7,9 @@ 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.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.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.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;

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

@@ -5,8 +5,8 @@ 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.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+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;

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

@@ -9,8 +9,8 @@ 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.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
+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 org.springframework.stereotype.Service;

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

@@ -10,8 +10,8 @@ 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.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+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.acl.OauthClientService;
 import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.HomePageMapper;
 import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.LogMapper;

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

@@ -9,7 +9,7 @@ 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.utils.AuthUtil;
+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 org.springframework.stereotype.Service;

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

@@ -19,8 +19,8 @@ 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.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+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;

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

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

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

@@ -10,7 +10,7 @@ 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.utils.AuthUtil;
+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 org.springframework.stereotype.Service;

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

@@ -7,9 +7,9 @@ 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.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.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.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -6,8 +6,8 @@ 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.utils.PageUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
+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.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -10,7 +10,7 @@ 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.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.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;

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

@@ -8,7 +8,7 @@ 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.utils.AuthUtil;
+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;

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

@@ -13,7 +13,7 @@ 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.utils.AuthUtil;
+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;

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

@@ -9,9 +9,9 @@ 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.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.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.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;

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

@@ -10,7 +10,7 @@ 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.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.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;

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

@@ -7,7 +7,7 @@ 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.utils.AuthUtil;
+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 lombok.SneakyThrows;

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

@@ -10,7 +10,7 @@ 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.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.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;

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

@@ -5,7 +5,7 @@ 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.utils.AuthUtil;
+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 lombok.SneakyThrows;

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

@@ -12,7 +12,7 @@ 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.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;
 import com.css.simulation.resource.server.infrastructure.db.mysql.mapper.*;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

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

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

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

@@ -12,9 +12,9 @@ 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.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.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.github.pagehelper.PageInfo;

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

@@ -7,7 +7,7 @@ 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.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.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;

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

@@ -9,8 +9,8 @@ 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.utils.PageUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
+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;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/configuration/LogAdvice.java

@@ -0,0 +1,122 @@
+package com.css.simulation.resource.server.infrastructure.common.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.application.service.LogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+@ControllerAdvice
+public class LogAdvice implements ResponseBodyAdvice {
+
+    @Autowired
+    LogService logService;
+
+    @Override
+    public boolean supports(MethodParameter methodParameter, Class aClass) {
+        return true;
+    }
+
+    @Override
+    public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
+        //没有操作标记则返回
+        String operationType = LogUtil.getOperationType();
+        LogUtil.remove();//线程标记清空
+        if(ObjectUtil.isNull(operationType)){
+            return o;
+        }
+        //异常后返回
+        if(o instanceof ResponseBodyVO){
+            boolean status = ((ResponseBodyVO) o).isStatus();
+            if(!status){
+                return o;
+            }
+        }
+        //类注解的模块名
+        Class<?> containingClass = methodParameter.getContainingClass();
+        RequestMapping classAnnotation = containingClass.getAnnotation(RequestMapping.class);
+        if(ObjectUtil.isNull(classAnnotation)){
+            return o;
+        }
+        String modelName = classAnnotation.name();
+        if(ObjectUtil.isNull(modelName)){
+            modelName = "未命名模块";
+        }
+        try {
+            //获取ip
+            String ip = getRemoteAddress(serverHttpRequest);
+            LogOperationPO po = new LogOperationPO();
+            po.setIp(ip);
+            po.setModule(modelName);
+            po.setOperationType(operationType);
+            po.setUserId(AuthUtil.getCurrentUserId());
+            po.setUsername(AuthUtil.getCurrentUsername());
+            logService.saveOperationLog(po);
+        }catch (Exception e){
+            //e.printStackTrace();
+        }
+        return o;
+    }
+
+    //IP地址获取
+    private String getRemoteAddress(ServerHttpRequest serverHttpRequest) {
+        HttpHeaders headers = serverHttpRequest.getHeaders();
+        String ip = headers.getFirst("x-forwarded-for");
+        if(ip != null && ip.length() != 0){
+            if(ip.indexOf(",") != -1){
+                ip = ip.split(",")[0];
+            }
+        }
+        if(ip == null || ip.length() == 0){
+            ip = headers.getFirst("Proxy-Client-IP");
+        }
+        if(ip == null || ip.length() == 0){
+            ip = headers.getFirst("WL-Proxy-Client-IP");
+        }
+        if(ip == null || ip.length() == 0){
+            ip = headers.getFirst("HTTP_CLIENT_IP");
+        }
+        if(ip == null || ip.length() == 0){
+            ip = headers.getFirst("HTTP_X_FORWARDED_FOR");
+        }
+        if(ip == null || ip.length() == 0){
+            ip = headers.getFirst("X-Real-IP");
+        }
+        if(ip == null || ip.length() == 0){
+            ip = serverHttpRequest.getRemoteAddress().getAddress().getHostAddress();
+        }
+        if(isIpv4(ip)){
+            return ip;
+        }else{
+            return "Illegal IP address";
+        }
+
+    }
+
+    //IP地址验证，防止非法地址
+    private boolean isIpv4(String ipAddress) {
+        String ip = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
+                +"(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+                +"(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+                +"(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
+
+        Pattern pattern = Pattern.compile(ip);
+        Matcher matcher = pattern.matcher(ipAddress);
+        return matcher.matches();
+    }
+
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/demo/ctrl/TestCtrl.java

@@ -1,29 +0,0 @@
-package com.css.simulation.resource.server.infrastructure.common.demo.ctrl;
-
-import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.param.demo.TestPageParam;
-import api.common.pojo.vo.demo.TestVO;
-import com.css.simulation.resource.server.infrastructure.common.demo.service.TestService;
-import com.github.pagehelper.PageInfo;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-
-@Controller
-@RequestMapping("/test")
-public class TestCtrl {
-
-    @Resource
-    private TestService testService;
-
-    @RequestMapping("/getTestPageList")
-    @ResponseBody
-    public ResponseBodyVO<PageInfo<TestVO>> getTestPageList(@RequestBody TestPageParam pageParam){
-        ResponseBodyVO<PageInfo<TestVO>> response = new ResponseBodyVO<PageInfo<TestVO>>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(testService.getTestPageList(pageParam));
-        return response;
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/demo/mapper/TestMapper.java

@@ -1,17 +0,0 @@
-package com.css.simulation.resource.server.infrastructure.common.demo.mapper;
-
-
-import api.common.pojo.param.demo.TestPageParam;
-import api.common.pojo.vo.demo.TestVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface TestMapper {
-
-    List<TestVO> getTestPageList(TestPageParam params);
-
-}

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

@@ -1,37 +0,0 @@
-package com.css.simulation.resource.server.infrastructure.common.demo.service;
-
-import api.common.pojo.constants.DictConstants;
-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.service.DictService;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class TestService {
-
-    @Autowired
-    TestMapper testMapper;
-
-    @Autowired
-    DictService dictService;
-
-    public PageInfo<TestVO> getTestPageList(TestPageParam params) {
-        PageUtil.setPageInfo(params);
-        //params.setCreateUserId(AuthUtil.getCurrentUserId());
-        List<TestVO> list = testMapper.getTestPageList(params);
-        //字典翻译
-        //Map<String, Map<String, String>> dictMapsByTypes = dictService.getDictMapsByTypes(DictConstants.LEVEL + "," + DictConstants.DRIVE_TYPE);
-        Map<String, Map<String, String>> dictMapsByTypes = dictService.getDictMapsByTypes(DictConstants.LEVEL,DictConstants.DRIVE_TYPE);
-        list.forEach(testVO ->{
-            testVO.setLevel_name(dictMapsByTypes.get(DictConstants.LEVEL).get(testVO.getLevel()));
-        });
-        return new PageInfo<>(list);
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/common/oauth/AuthorityCheck.java

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

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

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

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

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

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

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