lyhzzz 2 年之前
父节点
当前提交
32adb2165e

+ 3 - 2
src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java

@@ -29,11 +29,12 @@ public class WebAppConfig implements WebMvcConfigurer {
 						"/test/**",
 						"/test/**",
 						"/_inner/**",
 						"/_inner/**",
 						"/**/fusion/**",
 						"/**/fusion/**",
-						"/goods/version/enabled",
 						"/**/scene/**",
 						"/**/scene/**",
 						"/intercomMessage/**",
 						"/intercomMessage/**",
 						"/order/pay/**",
 						"/order/pay/**",
-						"/article/**"
+						"/article/**",
+						"/goods/version/**",
+						"/inner/**"
 				);
 				);
 
 
 		registry.addInterceptor(appInterceptor).addPathPatterns("/app/**")
 		registry.addInterceptor(appInterceptor).addPathPatterns("/app/**")

+ 0 - 13
src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -119,19 +119,6 @@ public class SceneController extends BaseController {
         return sceneUpgradeToV4Service.upgrade(num);
         return sceneUpgradeToV4Service.upgrade(num);
     }
     }
 
 
-    /**
-     *
-     * 激光场景生成obj文件
-     */
-    @PostMapping(value = "/generateObjFile")
-    public Result generateObjFile(@RequestBody SceneParam requestScene) throws Exception{
-        String num = requestScene.getSceneNum();
-        if (StringUtils.isEmpty(num)) {
-            throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
-        }
-        sceneProService.generateObjFile(num);
-        return Result.success();
-    }
 
 
     /**
     /**
      *
      *

+ 35 - 0
src/main/java/com/fdkankan/ucenter/controller/api/LaserApiController.java

@@ -0,0 +1,35 @@
+package com.fdkankan.ucenter.controller.api;
+
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.constant.LoginConstant;
+import com.fdkankan.ucenter.service.ISceneProService;
+import com.fdkankan.ucenter.vo.request.SceneParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/inner")
+public class LaserApiController {
+
+    @Autowired
+    ISceneProService sceneProService;
+
+    /**
+     *
+     * 激光场景生成obj文件
+     */
+    @PostMapping(value = "/generateObjFile")
+    public Result generateObjFile(@RequestBody SceneParam requestScene) throws Exception{
+        String num = requestScene.getSceneNum();
+        if (StringUtils.isEmpty(num)) {
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
+        }
+        sceneProService.generateObjFile(num);
+        return Result.success();
+    }
+}

+ 2 - 1
src/main/java/com/fdkankan/ucenter/controller/app/AppApiController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
 @RestController
+@RequestMapping("/goods/version")
 public class AppApiController {
 public class AppApiController {
 
 
     @Autowired
     @Autowired
@@ -18,7 +19,7 @@ public class AppApiController {
     /**
     /**
      * 给硬件部接口,不需要拦截
      * 给硬件部接口,不需要拦截
      */
      */
-    @GetMapping("/goods/version/enabled")
+    @GetMapping("/enabled")
     public Result getEnabledCameraVersion(@RequestParam(required = false) String type) {
     public Result getEnabledCameraVersion(@RequestParam(required = false) String type) {
         return Result.success(cameraVersionService.findByStatus(type));
         return Result.success(cameraVersionService.findByStatus(type));
     }
     }