From 3033ccf3878fae2c204df53be2a283f29f5853ed Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 10 十月 2025 18:17:02 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java index 7915b86..7c69cb3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java @@ -2,14 +2,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.system.mapper.TSysProductIntroductionMapper; import com.ruoyi.system.model.TSysEducationalInfo; import com.ruoyi.system.model.TSysProductIntroduction; import com.ruoyi.system.query.TSysProductIntroductionQuery; import com.ruoyi.system.service.TSysProductIntroductionService; +import com.ruoyi.system.vo.TSysProductIntroductionVO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.List; +import java.util.Set; /** * <p> @@ -22,10 +28,25 @@ @Service public class TSysProductIntroductionServiceImpl extends ServiceImpl<TSysProductIntroductionMapper, TSysProductIntroduction> implements TSysProductIntroductionService { + @Autowired + private RedisCache redisCache; + @Override - public PageInfo<TSysProductIntroduction> pageList(TSysProductIntroductionQuery query) { - PageInfo<TSysProductIntroduction> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); - List<TSysProductIntroduction> list = this.baseMapper.pageList(query,pageInfo); + public PageInfo<TSysProductIntroductionVO> pageList(TSysProductIntroductionQuery query) { + PageInfo<TSysProductIntroductionVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<TSysProductIntroductionVO> list = this.baseMapper.pageList(query,pageInfo); + if (CollectionUtils.isEmpty(list)){ + return pageInfo; + } + if(query.getRoleType() == 5){ + Long userId = query.getUserId(); + for (TSysProductIntroductionVO tSysProductIntroduction : list) { + Set<Long> cacheSet = redisCache.getCacheSet(Constants.SYS_PRODUCT_CLICK_COUNT + tSysProductIntroduction.getId()); + if(cacheSet.contains(userId)){ + tSysProductIntroduction.setIsView(true); + } + } + } pageInfo.setRecords(list); return pageInfo; } -- Gitblit v1.7.1