修改

src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java

@@ -2,6 +2,8 @@ package com.ycwl.basic.controller.mobile;
 
 import com.github.pagehelper.PageInfo;
 import com.ycwl.basic.annotation.IgnoreToken;
+import com.ycwl.basic.constant.BaseContextHandler;
+import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.mobile.goods.GoodsPageVO;
 import com.ycwl.basic.model.mobile.goods.GoodsReqQuery;
 import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
@@ -12,6 +14,7 @@ import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
 import com.ycwl.basic.service.mobile.AppScenicService;
 import com.ycwl.basic.service.pc.ScenicService;
 import com.ycwl.basic.utils.ApiResponse;
+import com.ycwl.basic.utils.JwtTokenUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,13 +41,13 @@ public class AppScenicController {
     }
     @ApiOperation("根据id查询景区详情")
     @IgnoreToken
-    @GetMapping("getDetails/{id}")
+    @GetMapping("/{id}")
     public ApiResponse<ScenicRespVO> getDetails(@PathVariable Long id){
         return appScenicService.getDetails(id);
     }
 
     @ApiOperation("查询景区设备总数和拍到用户的机位数量")
-    @GetMapping("/deviceCountByScenicId/{scenicId}")
+    @GetMapping("/{scenicId}/deviceCount/")
     public ApiResponse<ScenicDeviceCountVO> deviceCountByScenicId(@PathVariable Long scenicId){
         return appScenicService.deviceCountByScenicId(scenicId);
     }
@@ -56,9 +59,10 @@ public class AppScenicController {
     }
 
     @ApiOperation("景区视频源素材列表")
-    @GetMapping("/contentList/{faceId}")
+    @GetMapping("/face/{faceId}/contentList")
     public ApiResponse<List<ContentPageVO>> contentList(@PathVariable Long faceId) {
-        return appScenicService.contentList(faceId);
+        JwtInfo worker = JwtTokenUtil.getWorker();
+        return appScenicService.faceContentList(worker.getUserId(), faceId);
     }