From 468139d617c56536b07bd4ddcf52f5330c3449b8 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 07 七月 2025 11:59:55 +0800 Subject: [PATCH] 视频播放记录 --- buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java | 11 ++++------- framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java | 3 ++- framework/src/main/resources/mapper/lmk/VideoMapper.xml | 4 ++-- framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 8 +++++++- framework/src/main/java/cn/lili/modules/member/service/FootprintService.java | 3 ++- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java index 455ec80..caf0910 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java @@ -1,10 +1,8 @@ package cn.lili.controller.member; -import cn.lili.base.Result; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.StringUtils; -import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dto.FootPrintQueryParams; import cn.lili.modules.member.service.FootprintService; @@ -14,7 +12,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.catalina.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -67,10 +64,10 @@ } @ApiOperation(value = "鏍规嵁id鍒犻櫎") - @ApiImplicitParam(name = "ids", value = "鍟嗗搧ID", required = true, allowMultiple = true, dataType = "String", paramType = "path") - @DeleteMapping(value = "/delByIds/{ids}") - public ResultMessage<Object> delAllByIds(@NotNull(message = "鍟嗗搧ID涓嶈兘涓虹┖") @PathVariable("ids") List ids) { - footprintService.deleteByIds(ids); + @ApiImplicitParam(name = "ids", value = "鍏宠仈ID", required = true, allowMultiple = true, dataType = "String", paramType = "path") + @DeleteMapping(value = "/delByIds/{viewType}/{ids}") + public ResultMessage<Object> delAllByIds(@NotNull(message = "鍏宠仈ID涓嶈兘涓虹┖") @PathVariable("ids") List ids, @PathVariable("viewType") String viewType) { + footprintService.deleteByIds(ids, viewType); return ResultUtil.success(); } diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java index 6273085..204b995 100644 --- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java @@ -497,11 +497,17 @@ videoEsQuery.setPageNumber((int) query.getPageNumber()); videoEsQuery.setPageSize((int) query.getPageSize()); return this.esSearch(videoEsQuery); - case "goodsSimilarly": + case "goodsSimilarly": // 鎮寕鐩稿悓鍟嗗搧鐨勬帹鑽愯棰� GoodsSimilarlyQuery goodsSimilarlyQuery = new GoodsSimilarlyQuery(); BeanUtils.copyProperties(query, goodsSimilarlyQuery); baseMapper.goodsSimilarlyPage(page, goodsSimilarlyQuery); break; + case "history": + VideoHistoryQuery videoHistoryQuery = new VideoHistoryQuery(); + BeanUtils.copyProperties(query, videoHistoryQuery); + videoHistoryQuery.setUserId(UserContext.getCurrentUserId()); + baseMapper.getHistoryPage(page, videoHistoryQuery); + break; default: break; } diff --git a/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java b/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java index bdefe04..4575232 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java @@ -37,9 +37,10 @@ * 鏍规嵁ID杩涜娓呴櫎浼氬憳鐨勫巻鍙茶冻杩� * * @param ids 鍟嗗搧ID鍒楄〃 + * @param viewType 娴忚绫诲瀷 * @return 澶勭悊缁撴灉 */ - boolean deleteByIds(List<String> ids); + boolean deleteByIds(List<String> ids, String viewType); /** * 鑾峰彇浼氬憳娴忚鍘嗗彶鍒嗛〉 diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java index 79458d9..595e162 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java @@ -52,9 +52,10 @@ } @Override - public boolean deleteByIds(List<String> ids) { + public boolean deleteByIds(List<String> ids, String viewType) { LambdaQueryWrapper<FootPrint> lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.eq(FootPrint::getMemberId, UserContext.getCurrentUser().getId()); + lambdaQueryWrapper.eq(FootPrint::getViewType, viewType); lambdaQueryWrapper.in(FootPrint::getRefId, ids); return this.remove(lambdaQueryWrapper); } diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml index c9918c3..30a55b7 100644 --- a/framework/src/main/resources/mapper/lmk/VideoMapper.xml +++ b/framework/src/main/resources/mapper/lmk/VideoMapper.xml @@ -349,8 +349,8 @@ LFP.play_at, LFP.update_time as playTime FROM - lmk_video LV - INNER JOIN li_foot_print LFP ON LFP.ref_id = LV.id AND LFP.view_type = 'video' AND LFP.delete_flag = 0 AND LFP.member_id = #{query.userId} + li_foot_print LFP + INNER JOIN lmk_video LV ON LFP.ref_id = LV.id AND LFP.view_type = 'video' AND LFP.delete_flag = 0 AND LFP.member_id = #{query.userId} LEFT JOIN li_member LM ON LV.author_id = LM.id WHERE LV.delete_flag = 0 AND LV.status = '1' -- Gitblit v1.8.0