算法平台

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.algorithm_library;
 
 
 import api.common.pojo.common.ResponseBodyVO;
@@ -17,7 +17,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping(value = "/algorithm", name = LogConstants.MODULE_ALGORITH)
-public class AlgorithmController {
+public class AlgorithmLibraryController {
 
     @Resource
     private AlgorithmService algorithmService;

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.job_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.DictParam;
@@ -22,7 +22,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/simulationProject")
-public class SimulationProjectController {
+public class JobManageController {
 
   @Resource
   private SimulationProjectService simulationProjectService;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.job_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
@@ -14,7 +14,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/monitor")
-public class MonitorCtrl {
+public class MonitorController {
 
     @Resource
     private SimulationProjectService simulationProjectService;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/ReportCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/ReportController.java

@@ -1,48 +1,41 @@
-package com.css.simulation.resource.server.api.controller;
+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.pojo.vo.project.ProjectReportVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.application.ReportService;
 import com.css.simulation.resource.server.application.SimulationProjectService;
-import org.springframework.beans.factory.annotation.Autowired;
-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 org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.Map;
 
-@Controller
+@RestController
 @RequestMapping("/report")
-public class ReportCtrl {
+public class ReportController {
 
-    @Autowired
-    ReportService reportService;
-
-    @Autowired
-    SimulationProjectService simulationProjectService;
 
+    @Resource
+    private SimulationProjectService simulationProjectService;
 
 
     /**
      * 获取测试报告详情
-     * @param paramMap
-     * @return
+     *
      */
     @RequestMapping("getSimulationReportById")
-    @ResponseBody
-    public ResponseBodyVO<ProjectReportVO> getSimulationReportById(@RequestBody Map<String,String> paramMap){
-        if(ObjectUtil.isNull(paramMap) || ObjectUtil.isNull(paramMap.get("algorithmId"))){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+    public ResponseBodyVO<ProjectReportVO> getSimulationReportById(@RequestBody Map<String, String> paramMap) {
+        if (ObjectUtil.isNull(paramMap) || ObjectUtil.isNull(paramMap.get("algorithmId"))) {
+            return new ResponseBodyVO(false, 500, "参数必传！", null);
         }
 
         //获取最新的报告id
         String projectId = simulationProjectService.selectProjectReportIdByAlgorithmId(paramMap.get("algorithmId"));
-        if(StringUtil.isEmpty(projectId)){
-            return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE,"报告不存在");
+        if (StringUtil.isEmpty(projectId)) {
+            return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "报告不存在");
         }
 
         //获取报告详情

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.scene_library.scene_test_package;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -33,7 +33,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping(value = "/ScenePackage", name = LogConstants.MODULE_SCENE_TEST_PACKAGE)
-public class ScenePackageController {
+public class SceneTestPackageController {
 
     @Resource
     private ScenePackageService scenePackageService;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.scene_library.score_rule;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -24,7 +24,7 @@ import java.util.Map;
 //打分规则
 @RestController
 @RequestMapping(value = "/ScoringRules", name = LogConstants.MODULE_SCORING)
-public class ScoringRulesController {
+public class ScoreRuleController {
 
     @Resource
     private ScoringRulesService scoringRulesService;

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.system_manage.account_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.RoleParam;
@@ -7,28 +7,27 @@ import api.common.pojo.vo.system.RoleVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.server.application.RoleService;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-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 org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
 
 /**
  * 角色管理
  */
-@Controller
+@RestController
 @RequestMapping("/role")
 public class RoleController {
 
-    @Autowired
-    RoleService roleService;
+    @Resource
+    private RoleService roleService;
 
     /**
      * 获取角色列表
      */
     @RequestMapping("/getRolePageList")
-    @ResponseBody
-    public ResponseBodyVO<PageInfo<RoleVO>> getRolePageList(@RequestBody RoleParam pageParam){
+    public ResponseBodyVO<PageInfo<RoleVO>> getRolePageList(@RequestBody RoleParam pageParam) {
         ResponseBodyVO<PageInfo<RoleVO>> response = new ResponseBodyVO<PageInfo<RoleVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(roleService.getRolePageList(pageParam));
         return response;
@@ -38,10 +37,9 @@ public class RoleController {
      * 新增、修改
      */
     @RequestMapping("/saveRole")
-    @ResponseBody
-    public ResponseBodyVO<RolePO> saveRole(@RequestBody RoleVO roleVO){
-        if(ObjectUtil.isNull(roleVO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+    public ResponseBodyVO<RolePO> saveRole(@RequestBody RoleVO roleVO) {
+        if (ObjectUtil.isNull(roleVO)) {
+            return new ResponseBodyVO(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<RolePO> response = new ResponseBodyVO<RolePO>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(roleService.saveRole(roleVO));
@@ -52,13 +50,12 @@ public class RoleController {
      * 删除
      */
     @RequestMapping("/delRoleById")
-    @ResponseBody
-    public ResponseBodyVO delRoleById(@RequestBody RolePO rolePO){
+    public ResponseBodyVO delRoleById(@RequestBody RolePO rolePO) {
         int i = roleService.delRoleById(rolePO);
-        if(i>0){
+        if (i > 0) {
             return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        }else{
-            return new ResponseBodyVO(false, 500, "删除失败！",null);
+        } else {
+            return new ResponseBodyVO(false, 500, "删除失败！", null);
         }
     }
 
@@ -66,10 +63,9 @@ public class RoleController {
      * 授权菜单
      */
     @RequestMapping("/saveMenusToRole")
-    @ResponseBody
-    public ResponseBodyVO<RoleVO> saveMenusToRole(@RequestBody RoleVO roleVO){
-        if(ObjectUtil.isNull(roleVO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+    public ResponseBodyVO<RoleVO> saveMenusToRole(@RequestBody RoleVO roleVO) {
+        if (ObjectUtil.isNull(roleVO)) {
+            return new ResponseBodyVO(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<RoleVO> response = new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(roleService.saveMenusToRole(roleVO));

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.system_manage.cluster_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.ClusterParam;
@@ -7,30 +7,28 @@ import api.common.pojo.vo.system.ClusterVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.server.application.ClusterService;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-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 org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 
 
-@Controller()
+@RestController
 @RequestMapping("/cluster")
 @PreAuthorize("@AuthorityCheck.adminAndUser()")
 public class ClusterController {
 
-    @Autowired
-    ClusterService clusterService;
+    @Resource
+    private ClusterService clusterService;
 
 
     /**
      * 查询集群列表
      */
     @RequestMapping("/getClusterList")
-    @ResponseBody
     public ResponseBodyVO<PageInfo<ClusterVO>> getClusterList(@RequestBody ClusterParam clusterParam) {
         ResponseBodyVO<PageInfo<ClusterVO>> response = new ResponseBodyVO<PageInfo<ClusterVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(clusterService.getClusterList(clusterParam));
@@ -41,7 +39,6 @@ public class ClusterController {
      * 新增、修改
      */
     @RequestMapping("/saveCluster")
-    @ResponseBody
     public ResponseBodyVO<ClusterPO> saveCluster(@RequestBody ClusterPO clusterPO) {
         if (ObjectUtil.isNull(clusterPO)) {
             return new ResponseBodyVO(false, 400, "参数必传！", null);
@@ -56,7 +53,6 @@ public class ClusterController {
      * 查询集群修改历史记录
      */
     @RequestMapping("/getClusterHistory")
-    @ResponseBody
     public ResponseBodyVO<PageInfo<ClusterVO>> getClusterHistory(@RequestBody ClusterParam clusterParam) {
         ResponseBodyVO<PageInfo<ClusterVO>> response = new ResponseBodyVO<PageInfo<ClusterVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(clusterService.getClusterHistory(clusterParam));
@@ -68,7 +64,6 @@ public class ClusterController {
      * 查询已分配未到期节点数量
      */
     @RequestMapping("/getClusterNum")
-    @ResponseBody
     public ResponseBodyVO<HashMap<String, Integer>> getClusterNum() {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, clusterService.getClusterNum());
     }
@@ -77,7 +72,6 @@ public class ClusterController {
      * 查询仿真软件license数量
      */
     @RequestMapping("/getLicenseNum")
-    @ResponseBody
     public ResponseBodyVO<Integer> getLicenseNum() {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, clusterService.getLicenseNum());
     }
@@ -87,7 +81,6 @@ public class ClusterController {
      * 编辑页面查询有效的集群信息
      */
     @RequestMapping("/getValidClusterInfo")
-    @ResponseBody
     public ResponseBodyVO<ClusterVO> getValidClusterInfo(@RequestBody ClusterParam clusterParam) {
         ResponseBodyVO<ClusterVO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(clusterService.getValidClusterInfo(clusterParam));

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.system_manage.parameter_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.ParameterParam;
@@ -7,31 +7,29 @@ import api.common.pojo.vo.system.ParameterVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.server.application.ParameterService;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-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 org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 
 
-@Controller()
+@RestController
 @RequestMapping("/parameter")
 @PreAuthorize("@AuthorityCheck.admin()")
 public class ParameterController {
 
-    @Autowired
-    ParameterService parameterService;
+    @Resource
+    private ParameterService parameterService;
 
 
     /**
      * 查询参数列表
      */
     @RequestMapping("/getParameterList")
-    @ResponseBody
-    public ResponseBodyVO<PageInfo<ParameterVO>> getParameterList(@RequestBody ParameterParam pageParam){
+    public ResponseBodyVO<PageInfo<ParameterVO>> getParameterList(@RequestBody ParameterParam pageParam) {
         ResponseBodyVO<PageInfo<ParameterVO>> response = new ResponseBodyVO<PageInfo<ParameterVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(parameterService.getParameterList(pageParam));
         return response;
@@ -41,10 +39,9 @@ public class ParameterController {
      * 新增、修改
      */
     @RequestMapping("/saveParameter")
-    @ResponseBody
     public ResponseBodyVO<ParameterPO> saveParameter(@RequestBody ParameterPO parameterPO) {
-        if(ObjectUtil.isNull(parameterPO)){
-            return new ResponseBodyVO(false, 400, "参数必传！",null);
+        if (ObjectUtil.isNull(parameterPO)) {
+            return new ResponseBodyVO(false, 400, "参数必传！", null);
         }
         ResponseBodyVO<ParameterPO> response = new ResponseBodyVO<ParameterPO>(ResponseBodyVO.Response.SUCCESS);
         parameterPO = parameterService.saveParameter(parameterPO);
@@ -56,8 +53,7 @@ public class ParameterController {
      * 查询参数修改历史记录
      */
     @RequestMapping("/getParamHistory")
-    @ResponseBody
-    public ResponseBodyVO<PageInfo<ParameterVO>> getParamHistory(@RequestBody ParameterParam pageParam){
+    public ResponseBodyVO<PageInfo<ParameterVO>> getParamHistory(@RequestBody ParameterParam pageParam) {
         ResponseBodyVO<PageInfo<ParameterVO>> response = new ResponseBodyVO<PageInfo<ParameterVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(parameterService.getParamHistory(pageParam));
         return response;
@@ -67,7 +63,6 @@ public class ParameterController {
      * 查询场景分配配置信息
      */
     @RequestMapping("/getSceneParam")
-    @ResponseBody
     public ResponseBodyVO<HashMap<String, Integer>> getSceneParam() {
         ResponseBodyVO<HashMap<String, Integer>> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         HashMap<String, Integer> sceneParam = parameterService.getSceneParam();

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.system_manage.scene_package_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.SystemScenePackageParam;
@@ -21,7 +21,7 @@ import java.util.Map;
 //场景包
 @RestController
 @RequestMapping("/SystemScenePackage")
-public class SystemScenePackageController {
+public class ScenePackageController {
 
     @Resource
     SystemScenePackageService systemScenePackageService;

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.api.controller;
+package com.css.simulation.resource.server.api.controller.system_manage.scene_upload;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping("/sceneImport")
 @PreAuthorize("@AuthorityCheck.admin()")
-public class SceneImportController {
+public class SceneUploadController {
 
     @Resource
     private SceneImportService sceneImportService;