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

用户UID

Browse Source
This commit is contained in:
Jerry Yan
2025-03-14 16:48:54 +08:00
parent 05bc2773b9
commit 41aba63e5d
17 changed files with 31 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,7 +197,7 @@ public class LyCompatibleController {
return R.error("用户没有上传过照片！");
}
VideoTaskStatusVO taskStatusVO = goodsService.getTaskStatusByScenicId(member.getId(), member.getScenicId());
List<ContentPageVO> listApiResponse = appScenicService.faceContentList(member.getId(), faceVO.getId());
List<ContentPageVO> listApiResponse = appScenicService.faceContentList(faceVO.getId());
Map<Integer, List<ContentPageVO>> collect = listApiResponse.stream()
.filter(contentPageVO -> contentPageVO.getLockType() < 0)
.collect(Collectors.groupingBy(ContentPageVO::getGoodsType));

11
src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java
View File

@ -1,13 +1,11 @@
package com.ycwl.basic.controller.mobile;
import com.ycwl.basic.annotation.IgnoreToken;
import com.ycwl.basic.biz.TaskStatusBiz;
import com.ycwl.basic.constant.BaseContextHandler;
import com.ycwl.basic.exception.CheckTokenException;
import com.ycwl.basic.model.jwt.JwtInfo;
import com.ycwl.basic.model.mobile.goods.*;
import com.ycwl.basic.service.mobile.GoodsService;
import com.ycwl.basic.service.task.TaskService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.JwtTokenUtil;
import io.swagger.annotations.Api;
@ -15,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
/**
@ -30,10 +27,6 @@ public class AppGoodsController {
@Autowired
private GoodsService goodsService;
@Autowired
private TaskService taskService;
@Autowired
private TaskStatusBiz taskStatusBiz;
@ApiOperation("商品列表")
@PostMapping("/goodsList")
@ -63,7 +56,7 @@ public class AppGoodsController {
@GetMapping("/sourceGoods/{sourceId}")
public ApiResponse<GoodsDetailVO> sourceGoodsInfo(@PathVariable("sourceId") Long sourceId) {
JwtInfo worker = JwtTokenUtil.getWorker();
return goodsService.sourceGoodsInfo(worker.getUserId(), sourceId);
return goodsService.sourceGoodsInfo(sourceId);
}
/**
@ -88,6 +81,6 @@ public class AppGoodsController {
@GetMapping("/task/face/{faceId}/template/{templateId}")
public ApiResponse<VideoTaskStatusVO> getTemplateTaskStatus(@PathVariable("faceId") Long faceId, @PathVariable("templateId") Long templateId) {
JwtInfo worker = JwtTokenUtil.getWorker();
return ApiResponse.success(goodsService.getTaskStatusByTemplateId(worker.getUserId(), faceId, templateId));
return ApiResponse.success(goodsService.getTaskStatusByTemplateId(faceId, templateId));
}
}

54
src/main/java/com/ycwl/basic/controller/mobile/AppIndexController.java
View File

@ -1,54 +0,0 @@
package com.ycwl.basic.controller.mobile;
import com.ycwl.basic.annotation.IgnoreToken;
import com.ycwl.basic.model.mobile.index.TopStateResp;
import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO;
import com.ycwl.basic.service.mobile.AppScenicService;
import com.ycwl.basic.utils.ApiResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Author：longbinbin
* @Date：2024/12/5 10:20
*/
@RestController
@RequestMapping("/api/mobile/index/v1")
@Api(tags = "首页相关接口")
public class AppIndexController {
@Autowired
private AppScenicService scenicService;
/**
* 首页景区列表
*
* @return
*/
// @ApiOperation(value = "首页景区列表", notes = "首页景区列表")
// @PostMapping("/scenicList")
// @IgnoreToken
// public ApiResponse<List<ScenicAppVO>> scenicList(@RequestBody ScenicIndexVO scenicIndexVO) {
// return scenicService.scenicList(scenicIndexVO);
// }
// @ApiOperation(value = "顶部状态", notes = "顶部状态")
// @GetMapping("/topState")
// @IgnoreToken
// public ApiResponse<TopStateResp> topState() {
// return scenicService.topState();
// }
@GetMapping("/faceAgreement")
public ApiResponse<String> faceAgreement() {
return ApiResponse.success("人脸识别隐私协议：\n" +
"1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n" +
"1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n" +
"1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n");
}
}

20
src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java
View File

@ -62,26 +62,6 @@ public class AppMemberController {
return memberService.update(userInfoUpdateDTO);
}
/**
* 同意用户协议
*
* @return
*/
@ApiOperation("同意用户协议")
@GetMapping("/agreement")
public ApiResponse<?> agreement() {
return memberService.agreement();
}
@ApiOperation("是否首次获取视频")
@GetMapping("/isFirstObtainVideo")
public ApiResponse isFirstTimeObtainingVideo() {
// TODO 判断是否首次获取视频逻辑
return ApiResponse.success("");
}
@ApiOperation("新增或修改景区服务通知状态")
@GetMapping("/updateScenicServiceNoticeStatus")
public ApiResponse updateScenicServiceNoticeStatus(Long scenicId) {

4
src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java
View File

@ -38,13 +38,9 @@ public class AppOrderController {
@Autowired
private OrderService orderService;
@Autowired
private OrderRepository orderRepository;
@Autowired
private OrderBiz orderBiz;
@Autowired
private PriceBiz priceBiz;
@Autowired
private PriceRepository priceRepository;
@ApiOperation("用户端订单列表查询")
@PostMapping("/page")

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

@ -2,10 +2,7 @@ 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;
import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO;
@ -14,7 +11,6 @@ import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
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.ScenicService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.JwtTokenUtil;
import io.swagger.annotations.Api;
@ -74,16 +70,8 @@ public class AppScenicController {
@ApiOperation("景区视频源素材列表")
@GetMapping("/face/{faceId}/contentList")
public ApiResponse<List<ContentPageVO>> contentList(@PathVariable String faceId) {
if (!StringUtils.isNumeric(faceId)) {
log.error("请求异常, faceId: [{}]",faceId);
return ApiResponse.fail("请求异常");
}
Long id = Long.parseLong(faceId);
JwtInfo worker = JwtTokenUtil.getWorker();
List<ContentPageVO> contentPageVOS = appScenicService.faceContentList(worker.getUserId(), id);
public ApiResponse<List<ContentPageVO>> contentList(@PathVariable Long faceId) {
List<ContentPageVO> contentPageVOS = appScenicService.faceContentList(faceId);
return ApiResponse.success(contentPageVOS);
}
}

5
src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java
View File

@ -1,7 +1,6 @@
package com.ycwl.basic.controller.mobile;
import com.ycwl.basic.annotation.IgnoreLogReq;
import com.ycwl.basic.biz.TaskStatusBiz;
import com.ycwl.basic.model.jwt.JwtInfo;
import com.ycwl.basic.model.mobile.goods.VideoTaskReq;
import com.ycwl.basic.model.mobile.goods.VideoTaskStatusVO;
@ -30,7 +29,7 @@ public class AppTaskController {
@IgnoreLogReq
public ApiResponse<VideoTaskStatusVO> getTaskStatusByFaceId(@PathVariable("faceId") Long faceId) {
JwtInfo worker = JwtTokenUtil.getWorker();
return ApiResponse.success(goodsService.getTaskStatusByFaceId(worker.getUserId(), faceId));
return ApiResponse.success(goodsService.getTaskStatusByFaceId(faceId));
}
@GetMapping("/scenic/{scenicId}")
@IgnoreLogReq
@ -52,7 +51,7 @@ public class AppTaskController {
@IgnoreLogReq
public ApiResponse<VideoTaskStatusVO> getTemplateTaskStatus(@PathVariable("faceId") Long faceId, @PathVariable("templateId") Long templateId) {
JwtInfo worker = JwtTokenUtil.getWorker();
return ApiResponse.success(goodsService.getTaskStatusByTemplateId(worker.getUserId(), faceId, templateId));
return ApiResponse.success(goodsService.getTaskStatusByTemplateId(faceId, templateId));
}
@PostMapping("/submit")