场景上传覆盖

simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/feign/SceneService.java → simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/common/feign/SceneService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.feign;
+package com.css.simulation.resource.scene.common.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.SceneImportParam;

simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/feign/SceneServiceFallback.java → simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/common/feign/SceneServiceFallback.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.feign;
+package com.css.simulation.resource.scene.common.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.SceneImportParam;

simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/controller/SceneImportCtrl.java → simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/controller/SceneImportController.java

@@ -5,7 +5,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.po.system.SceneImportPO;
 import com.css.simulation.resource.scene.common.oauth.AuthorizationHolder;
-import com.css.simulation.resource.scene.feign.SceneService;
+import com.css.simulation.resource.scene.common.feign.SceneService;
 import com.css.simulation.resource.scene.service.SceneImportService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest;
 @Controller
 @Slf4j
 @RequestMapping("/sceneImport")
-public class SceneImportCtrl {
+public class SceneImportController {
 
     @Resource
     SceneImportService sceneImportService;

simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/SceneImportMapper.java → simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/mapper/SceneImportMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene;
+package com.css.simulation.resource.scene.mapper;
 
 import api.common.pojo.po.system.SceneImportPO;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -6,7 +6,7 @@ import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.scene.SceneImportMapper;
+import com.css.simulation.resource.scene.mapper.SceneImportMapper;
 import com.css.simulation.resource.scene.common.utils.PoUtil;
 import io.minio.MinioClient;
 import io.minio.UploadObjectArgs;

simulation-resource-scene/src/main/resources/mapper/SceneImportMapper.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.scene.SceneImportMapper" >
+<mapper namespace="com.css.simulation.resource.scene.mapper.SceneImportMapper" >
 
     <update id="updateStatus" parameterType="api.common.pojo.po.system.SceneImportPO">
         update scene_import_task set
@@ -11,4 +11,4 @@
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
-</mapper>
+</mapper>

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneAccidentController.java

@@ -32,6 +32,24 @@ public class SceneAccidentController {
     @Resource
     private SceneImportService sceneImportService;
 
+    //* -------------------------------- 场景上传任务 --------------------------------
+
+    @PostMapping("/saveSceneAccidentBatch")
+    public ResponseBodyVO<String> saveSceneAccidentBatch(@RequestBody SceneImportParam sceneImportParam) {
+        //1 更新任务状态
+        SceneImportPO sceneImportPO = new SceneImportPO();
+        sceneImportPO.setId(sceneImportParam.getId());
+        sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
+        sceneImportService.updateStatus(sceneImportPO);
+        //2 上传场景
+        sceneImportPO = sceneAccidentService.importMiNio(sceneImportParam);
+        //3 更新任务状态
+        sceneImportService.updateInfo(sceneImportPO);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+    }
+
+    //* -------------------------------- Comment --------------------------------
+
     @PostMapping("/batchDeleteSceneAccident")
     public ResponseBodyVO<String> batchDeleteSceneAccident(@RequestBody SceneAccidentParam params) {
         List<String> sceneNameList = params.getSceneNameList();
@@ -74,22 +92,6 @@ public class SceneAccidentController {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
-    /**
-     * 场景上传任务
-     */
-    @PostMapping("/saveSceneAccidentBatch")
-    public ResponseBodyVO<String> saveSceneAccidentBatch(@RequestBody SceneImportParam sceneImportParam) {
-        //1 更新任务状态
-        SceneImportPO sceneImportPO = new SceneImportPO();
-        sceneImportPO.setId(sceneImportParam.getId());
-        sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
-        sceneImportService.updateStatus(sceneImportPO);
-        //2 上传场景
-        sceneImportPO = sceneAccidentService.importMiNio(sceneImportParam);
-        //3 更新任务状态
-        sceneImportService.updateInfo(sceneImportPO);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
-    }
 
     /**
      * 分享交通事故

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneGeneralTemplateController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneGeneralController.java

@@ -35,7 +35,7 @@ import java.util.Map;
 //泛化场景
 @RestController
 @RequestMapping("/SceneGeneralTemplate")
-public class SceneGeneralTemplateController {
+public class SceneGeneralController {
 
     @Resource
     private SceneGeneralTemplateService sceneGeneralTemplateService;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneStandardsRegulationsController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneStandardsController.java

@@ -25,13 +25,31 @@ import java.util.List;
 //标准法规
 @RestController
 @RequestMapping("/StandardsRegulations")
-public class SceneStandardsRegulationsController {
+public class SceneStandardsController {
 
     @Resource
     private StandardsRegulationsService standardsRegulationsService;
     @Resource
     private SceneImportService sceneImportService;
 
+    //* -------------------------------- 场景上传 --------------------------------
+
+    @PostMapping("/saveStandardsRegulationsBatch")
+    public ResponseBodyVO<String> saveStandardsRegulationsBatch(@RequestBody SceneImportParam sceneImportParam) {
+        SceneImportPO sceneImportPO = new SceneImportPO();
+        sceneImportPO.setId(sceneImportParam.getId());
+        sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
+        sceneImportService.updateStatus(sceneImportPO);
+        // 解析参数
+        sceneImportPO = standardsRegulationsService.importMinio(sceneImportParam);
+        sceneImportService.updateInfo(sceneImportPO);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+    }
+
+    //* -------------------------------- Comment --------------------------------
+
+
+
     @PostMapping("/batchDeleteSceneStandards")
     public ResponseBodyVO<String> batchDeleteSceneStandards(@RequestBody StandardsRegulationsParam params) {
         List<String> sceneNameList = params.getSceneNameList();
@@ -78,20 +96,6 @@ public class SceneStandardsRegulationsController {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
-    /**
-     * 测试批量导入
-     */
-    @PostMapping("/saveStandardsRegulationsBatch")
-    public ResponseBodyVO<String> saveStandardsRegulationsBatch(@RequestBody SceneImportParam sceneImportParam) {
-        SceneImportPO sceneImportPO = new SceneImportPO();
-        sceneImportPO.setId(sceneImportParam.getId());
-        sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
-        sceneImportService.updateStatus(sceneImportPO);
-        // 解析参数
-        sceneImportPO = standardsRegulationsService.importMinio(sceneImportParam);
-        sceneImportService.updateInfo(sceneImportPO);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
-    }
 
 
     /**

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/StandardsRegulationsService.java

@@ -318,7 +318,7 @@ public class StandardsRegulationsService {
                             }
                             if (isupdate.equals("0")) {
                                 // -------------------------------- 保存数据到 mysql --------------------------------
-                                log.info("StandardsRegulationsService--importMinio 添加标准法规数据：" + standardsRegulationsPO);
+                                log.info("添加标准法规数据：" + standardsRegulationsPO);
                                 standardsRegulationsPO.setCreateTime(TimeUtil.getNowForMysql());
                                 standardsRegulationsPO.setCreateUserId(AuthUtil.getCurrentUserId());
                                 standardsRegulationsPO.setModifyTime(TimeUtil.getNowForMysql());
@@ -326,7 +326,7 @@ public class StandardsRegulationsService {
                                 sceneNames.add(sceneName);
                             } else if (isupdate.equals("1")) {
                                 // -------------------------------- 修改数据到 mysql --------------------------------
-                                log.info("StandardsRegulationsService--importMinio 修改标准法规数据：" + standardsRegulationsPO);
+                                log.info("修改标准法规数据：" + standardsRegulationsPO);
                                 standardsRegulationsPO.setModifyTime(TimeUtil.getNowForMysql());
                                 standardsRegulationsPO.setModifyUserId(AuthUtil.getCurrentUserId());
                                 standardsRegulationsMapper.updateStandardsRegulations(standardsRegulationsPO);