From d527a8fdce5960f7ae11053eade2e11cb03e9390 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Mon, 16 Dec 2024 19:01:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=BB=98=E8=AE=A4=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BA=BA=E8=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/mobile/AppGoodsController.java | 5 +++++ .../basic/controller/mobile/AppScenicController.java | 6 ++++++ src/main/java/com/ycwl/basic/mapper/FaceMapper.java | 2 ++ .../java/com/ycwl/basic/mapper/TemplateMapper.java | 3 --- .../service/impl/mobile/AppScenicServiceImpl.java | 6 ++++++ .../basic/service/impl/mobile/GoodsServiceImpl.java | 11 ++++++++++- .../ycwl/basic/service/impl/pc/FaceServiceImpl.java | 1 - .../ycwl/basic/service/mobile/AppScenicService.java | 2 ++ .../com/ycwl/basic/service/mobile/GoodsService.java | 3 ++- .../com/ycwl/basic/service/task/TaskFaceService.java | 1 - src/main/resources/mapper/FaceMapper.xml | 7 +++++++ 11 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java index 6b1ba4e..e8de970 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java @@ -65,6 +65,11 @@ public class AppGoodsController { JwtInfo worker = JwtTokenUtil.getWorker(); return goodsService.getAllTaskStatus(worker.getUserId(),faceId); } + @GetMapping("/getTaskStatus/") + public ApiResponse getAllTaskStatus() { + JwtInfo worker = JwtTokenUtil.getWorker(); + return goodsService.getAllTaskStatus(worker.getUserId()); + } /** * 查询用户当前景区的具体模版视频合成任务状态 diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java index 92a9083..969eae6 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java @@ -49,6 +49,12 @@ public class AppScenicController { return appScenicService.deviceCountByScenicId(scenicId); } + @ApiOperation("景区视频源素材列表") + @GetMapping("/contentList/") + public ApiResponse> contentList() { + return appScenicService.contentListUseDefaultFace(); + } + @ApiOperation("景区视频源素材列表") @GetMapping("/contentList/{faceId}") public ApiResponse> contentList(@PathVariable Long faceId) { diff --git a/src/main/java/com/ycwl/basic/mapper/FaceMapper.java b/src/main/java/com/ycwl/basic/mapper/FaceMapper.java index 6a4a77f..e3b5279 100644 --- a/src/main/java/com/ycwl/basic/mapper/FaceMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/FaceMapper.java @@ -26,4 +26,6 @@ public interface FaceMapper { FaceRespVO getByMemberId(@Param("userId") Long userId, @Param("scenicId") Long scenicId); int finishedJourney(Long faceId); + + FaceRespVO findLastFaceByUserId(String userId); } diff --git a/src/main/java/com/ycwl/basic/mapper/TemplateMapper.java b/src/main/java/com/ycwl/basic/mapper/TemplateMapper.java index 5245606..0fec19a 100644 --- a/src/main/java/com/ycwl/basic/mapper/TemplateMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/TemplateMapper.java @@ -1,8 +1,5 @@ package com.ycwl.basic.mapper; -import com.ycwl.basic.model.pc.task.entity.TaskEntity; -import com.ycwl.basic.model.pc.task.req.TaskReqQuery; -import com.ycwl.basic.model.pc.task.resp.TaskRespVO; import com.ycwl.basic.model.pc.template.entity.TemplateConfigEntity; import com.ycwl.basic.model.pc.template.entity.TemplateEntity; import com.ycwl.basic.model.pc.template.req.TemplateReqQuery; diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java index b62628c..090b6c0 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java @@ -218,4 +218,10 @@ public class AppScenicServiceImpl implements AppScenicService { scenicLoginRespVO.setToken(token); return ApiResponse.success(scenicLoginRespVO); } + + @Override + public ApiResponse> contentListUseDefaultFace() { + FaceRespVO lastFaceByUserId = faceMapper.findLastFaceByUserId(BaseContextHandler.getUserId()); + return contentList(lastFaceByUserId.getId()); + } } diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java index 56a3722..eab6898 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java @@ -4,6 +4,7 @@ import com.ycwl.basic.mapper.*; import com.ycwl.basic.model.jwt.JwtInfo; import com.ycwl.basic.model.mobile.goods.*; import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO; +import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO; import com.ycwl.basic.model.pc.source.req.SourceReqQuery; import com.ycwl.basic.model.pc.source.resp.SourceRespVO; @@ -38,8 +39,10 @@ public class GoodsServiceImpl implements GoodsService { private TaskMapper taskMapper; @Autowired private DeviceMapper deviceMapper; + @Autowired + private FaceMapper faceMapper; - public ApiResponse> goodsList(GoodsReqQuery query) { + public ApiResponse> goodsList(GoodsReqQuery query) { JwtInfo worker = JwtTokenUtil.getWorker(); //查询原素材 List goodsList = new ArrayList<>(); @@ -222,6 +225,12 @@ public class GoodsServiceImpl implements GoodsService { } } + @Override + public ApiResponse getAllTaskStatus(Long userId) { + FaceRespVO lastFaceByUserId = faceMapper.findLastFaceByUserId(String.valueOf(userId)); + return getAllTaskStatus(userId,lastFaceByUserId.getId()); + } + @Override public ApiResponse getTemplateTaskStatus(Long userId, Long templateId) { TaskReqQuery taskReqQuery = new TaskReqQuery(); diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java index ee9513b..d18d6a7 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java @@ -1,6 +1,5 @@ package com.ycwl.basic.service.impl.pc; -import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.ycwl.basic.enums.StatisticEnum; diff --git a/src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java b/src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java index d129eeb..0a7752d 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java +++ b/src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java @@ -43,4 +43,6 @@ public interface AppScenicService { ApiResponse> contentList(Long scenicId); ApiResponse login(ScenicLoginReq scenicLoginReq) throws Exception; + + ApiResponse> contentListUseDefaultFace(); } diff --git a/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java b/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java index 4cf84c9..829c7a0 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java +++ b/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java @@ -46,7 +46,8 @@ public interface GoodsService { * @param userId * @return */ - ApiResponse getAllTaskStatus(Long userId ,Long scenicId); + ApiResponse getAllTaskStatus(Long userId ,Long faceId); + ApiResponse getAllTaskStatus(Long userId); ApiResponse getTemplateTaskStatus(Long userId, Long templateId); } diff --git a/src/main/java/com/ycwl/basic/service/task/TaskFaceService.java b/src/main/java/com/ycwl/basic/service/task/TaskFaceService.java index 0a1d8e7..aadb05b 100644 --- a/src/main/java/com/ycwl/basic/service/task/TaskFaceService.java +++ b/src/main/java/com/ycwl/basic/service/task/TaskFaceService.java @@ -1,6 +1,5 @@ package com.ycwl.basic.service.task; -import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.model.task.resp.AddFaceRespVo; import com.ycwl.basic.model.task.resp.SearchFaceRespVo; diff --git a/src/main/resources/mapper/FaceMapper.xml b/src/main/resources/mapper/FaceMapper.xml index df84e54..79f449b 100644 --- a/src/main/resources/mapper/FaceMapper.xml +++ b/src/main/resources/mapper/FaceMapper.xml @@ -86,4 +86,11 @@ from face where scenic_id = #{scenicId} and finished_journey != 1 +