From 62c330fcecdfe6dc096049cb954f1575b32bfbf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BA=86=E7=A5=A5?= Date: Wed, 1 Oct 2025 17:35:26 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E8=A7=86=E9=A2=91=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=8E=89=E5=B7=B2=E5=88=A0=E9=99=A4=E7=9A=84=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wzj/soopin/content/mapper/VlogMapper.java | 2 - .../soopin/content/service/VlogService.java | 9 ++++- .../service/impl/VlogPushServiceImpl.java | 3 +- .../content/service/impl/VlogServiceImpl.java | 12 +----- .../resources/mapper/content/VlogMapper.xml | 8 +++- .../mapper/content/VlogMapperCustom.xml | 38 ++++++++++++++++++- 6 files changed, 54 insertions(+), 18 deletions(-) diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapper.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapper.java index cd5e5b929..fb7acfff8 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapper.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/VlogMapper.java @@ -171,7 +171,5 @@ public interface VlogMapper extends BaseMapper { IPage getVlogForUser(Page page, @Param("memberId") Long memberId); - int readVlog(@Param("memberId") Long memberId, @Param("vlogId") String vlogId); - List selectUserLikeVlogList(@Param("memberId") Long memberId); } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/VlogService.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/VlogService.java index 40c1ca95c..80a51ba5d 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/VlogService.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/VlogService.java @@ -130,7 +130,6 @@ public interface VlogService extends IService { List> getRandomVlogs(int limit); IPage getVlogForUser(Page page, Long memberId); - int readVlog(Long memberId, String vlogId); List getIndexVlogList(VlogBO bo); Page getIndexVlogList(VlogBO bo,Page page); @@ -140,4 +139,12 @@ public interface VlogService extends IService { */ Page getIndexSearchVlogList(SearchBO bo, Page page); +// /** +// * 首页搜索/搜索的vlog列表 +// */ +// Page getHotVlogList(SearchBO bo, Page page); + + + + } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogPushServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogPushServiceImpl.java index 48cf64e5a..4a5364939 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogPushServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogPushServiceImpl.java @@ -62,7 +62,8 @@ public class VlogPushServiceImpl implements IVlogPushService { //从数据库中获取差量数据 Page vlogPage = new Page<>(1, count-rankSet.size()); vlogPage = vlogService.page(vlogPage, new LambdaQueryWrapper() - .orderByDesc(Vlog::getLikeCounts)); + .eq(Vlog::getDelFlag, "0") + .orderByDesc(Vlog::getLikeCounts)); Set vlogIds = vlogPage.getRecords().stream().map(vlog -> vlog.getId()).collect(Collectors.toSet()); rankSet.addAll(vlogIds); } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java index 1550e810b..4114ef3a5 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java @@ -553,17 +553,7 @@ public class VlogServiceImpl extends ServiceImpl implements Vl return baseMapper.getVlogForUser(page, memberId); } - @Override - @Transactional(rollbackFor = Exception.class) - public int readVlog(Long memberId, String vlogId) { - //加入已读缓存列表，数量为1 - if (!redisCache.zSetHasMember("vlog:read:" + memberId, vlogId)) { - redisCache.zSetAdd("vlog:read:" + memberId, vlogId, 1); - } else { - redisCache.zSetIncrement("vlog:read:" + memberId, vlogId, 1); - } - return baseMapper.readVlog(memberId, vlogId); - } + @Override public List getIndexVlogList(VlogBO bo) { diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapper.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapper.xml index 4ff5a8400..baf45d6ee 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapper.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapper.xml @@ -287,8 +287,8 @@ v.id FROM cont_vlog v - WHERE - NOT EXISTS ( + WHERE v.is_private = 0 and v.first_frame_img IS NOT NULL and IFNULL(v.del_flag,0) = 0 + AND NOT EXISTS ( SELECT 1 FROM cont_vlog_member m WHERE m.vlog_id = v.id AND m.member_id = ${memberId} ) @@ -329,6 +329,10 @@ ums_member m ON v.member_id = m.id WHERE v.member_id = #{memberId} + AND v.status = 1 + AND v.first_frame_img IS NOT NULL + AND v.is_private = 0 + and IFNULL(v.del_flag,0) = 0 ORDER BY v.create_time DESC diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml index 3372191be..be15a53f2 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml @@ -28,7 +28,7 @@ ums_member m ON v.member_id = m.id - WHERE v.first_frame_img IS NOT NULL + WHERE v.first_frame_img IS NOT NULL and ifnull(v.delete_flag,0) = 0 AND v.is_private = #{bo.isPrivate} @@ -108,6 +108,38 @@ AND v.first_frame_img IS NOT NULL + +