lyhzzz 2 years ago
parent
commit
bbc6adf68e

+ 13 - 10
src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -16,6 +16,7 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
+import com.fdkankan.ucenter.annotation.CheckInnerApiPermit;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
@@ -26,16 +27,7 @@ import com.fdkankan.ucenter.entity.ScenePlus;
 import com.fdkankan.ucenter.entity.ScenePro;
 import com.fdkankan.ucenter.entity.SceneProEdit;
 import com.fdkankan.ucenter.entity.User;
-import com.fdkankan.ucenter.service.ICameraDetailService;
-import com.fdkankan.ucenter.service.ICameraService;
-import com.fdkankan.ucenter.service.IScene3dNumService;
-import com.fdkankan.ucenter.service.ISceneCooperationService;
-import com.fdkankan.ucenter.service.IScenePlusExtService;
-import com.fdkankan.ucenter.service.IScenePlusService;
-import com.fdkankan.ucenter.service.ISceneProEditService;
-import com.fdkankan.ucenter.service.ISceneProService;
-import com.fdkankan.ucenter.service.ISceneStatisticsService;
-import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.service.impl.LoginService;
 import com.fdkankan.ucenter.service.impl.SceneApiService;
 import com.fdkankan.ucenter.vo.request.LoginParam;
@@ -89,6 +81,8 @@ public class SceneApiController extends BaseController {
     private FYunFileServiceInterface fYunFileService;
     @Autowired
     SceneApiService sceneApiService;
+    @Autowired
+    private IInnerService innerService;
 
     @Value("${main.url}")
     private String mainUrl;
@@ -430,4 +424,13 @@ public class SceneApiController extends BaseController {
         return Result.success(result);
     }
 
+    /**
+     * 查询场景资源路径
+     */
+    @CheckInnerApiPermit
+    @GetMapping("/querySceneDataSource")
+    public Result querySceneDataSource(String num){
+        return innerService.querySceneDataSource(num);
+    }
+
 }

+ 0 - 8
src/main/java/com/fdkankan/ucenter/controller/inner/InnerController.java

@@ -38,14 +38,6 @@ public class InnerController extends BaseController {
     }
 
     /**
-     * 查询场景资源路径
-     */
-    @CheckInnerApiPermit
-    @GetMapping("/querySceneDataSource")
-    public Result querySceneDataSource(String num){
-        return innerService.querySceneDataSource(num);
-    }
-    /**
      * 根据场景码获取场景码版本
      */
     @GetMapping("/_getSceneNumVersion")