q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
Jerry Yan
2025-05-19 15:04:20 +08:00
parent 44e0f4933b
commit 570267fd83
7 changed files with 158 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java vendored
View File

@@ -55,8 +55,6 @@ public class LyCompatibleController {
@Autowired
private FaceMapper faceMapper;
@Autowired
private AppScenicService appScenicService;
@Autowired
private VideoRepository videoRepository;
@Autowired
private VideoMapper videoMapper;
@@ -193,7 +191,7 @@ public class LyCompatibleController {
return R.error("用户没有上传过照片！");
}
VideoTaskStatusVO taskStatusVO = goodsService.getTaskStatusByScenicId(member.getId(), member.getScenicId());
List<ContentPageVO> listApiResponse = appScenicService.faceContentList(faceVO.getId());
List<ContentPageVO> listApiResponse = faceService.faceContentList(faceVO.getId());
Map<Integer, List<ContentPageVO>> collect = listApiResponse.stream()
.filter(contentPageVO -> contentPageVO.getLockType() < 0)
.collect(Collectors.groupingBy(ContentPageVO::getGoodsType));

9
src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java
View File

@@ -2,6 +2,7 @@ package com.ycwl.basic.controller.mobile;
import com.ycwl.basic.model.jwt.JwtInfo;
import com.ycwl.basic.model.mobile.face.FaceRecognizeResp;
import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO;
import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.service.pc.FaceService;
import com.ycwl.basic.utils.ApiResponse;
@@ -69,4 +70,12 @@ AppFaceController {
faceService.matchFaceId(faceId);
return ApiResponse.success("");
}
@ApiOperation("景区视频源素材列表")
@GetMapping("/{faceId}/contentList")
public ApiResponse<List<ContentPageVO>> contentList(@PathVariable Long faceId) {
List<ContentPageVO> contentPageVOS = faceService.faceContentList(faceId);
return ApiResponse.success(contentPageVOS);
}
}

7
src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java
View File

@@ -12,6 +12,7 @@ import com.ycwl.basic.model.pc.scenic.resp.ScenicConfigResp;
import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
import com.ycwl.basic.repository.ScenicRepository;
import com.ycwl.basic.service.mobile.AppScenicService;
import com.ycwl.basic.service.pc.FaceService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.JwtTokenUtil;
import io.swagger.annotations.Api;
@@ -33,6 +34,8 @@ import java.util.List;
@Api(tags = "景区相关接口")
public class AppScenicController {
@Autowired
private FaceService faceService;
@Autowired
private AppScenicService appScenicService;
@Autowired
@@ -83,13 +86,13 @@ public class AppScenicController {
@ApiOperation("景区视频源素材列表")
@GetMapping("/contentList/")
public ApiResponse<List<ContentPageVO>> contentList() {
return appScenicService.contentListUseDefaultFace();
return faceService.contentListUseDefaultFace();
}
@ApiOperation("景区视频源素材列表")
@GetMapping("/face/{faceId}/contentList")
public ApiResponse<List<ContentPageVO>> contentList(@PathVariable Long faceId) {
List<ContentPageVO> contentPageVOS = appScenicService.faceContentList(faceId);
List<ContentPageVO> contentPageVOS = faceService.faceContentList(faceId);
return ApiResponse.success(contentPageVOS);
}
}