From 77ad4788416a7e7a15dc15d0d2a01d304519262b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 11 十月 2025 10:36:34 +0800
Subject: [PATCH] 采购相关问题

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java
index 6aa84bf..17b0a55 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java
@@ -2,14 +2,21 @@
 
 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.TSysActivityMapper;
 import com.ruoyi.system.model.TSysActivity;
 import com.ruoyi.system.model.TSysEducationalInfo;
 import com.ruoyi.system.query.TSysActivityQuery;
 import com.ruoyi.system.service.TSysActivityService;
+import com.ruoyi.system.vo.TSysActivityVO;
+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>
@@ -21,11 +28,31 @@
  */
 @Service
 public class TSysActivityServiceImpl extends ServiceImpl<TSysActivityMapper, TSysActivity> implements TSysActivityService {
-
+    @Autowired
+    private RedisCache redisCache;
     @Override
-    public PageInfo<TSysActivity> pageList(TSysActivityQuery query) {
+    public PageInfo<TSysActivityVO> pageList(TSysActivityQuery query) {
+        PageInfo<TSysActivityVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TSysActivityVO> list = this.baseMapper.pageList(query,pageInfo);
+        if (CollectionUtils.isEmpty(list)){
+            return pageInfo;
+        }
+        if(query.getRoleType() == 5){
+            Long userId = query.getUserId();
+            for (TSysActivityVO sysActivityVO : list) {
+                Set<Long> cacheSet = redisCache.getCacheSet(Constants.SYS_ACTIVITY_CLICK_COUNT + sysActivityVO.getId());
+                if(cacheSet.contains(userId)){
+                    sysActivityVO.setIsView(true);
+                }
+            }
+        }
+        pageInfo.setRecords(list);
+        return pageInfo;
+    }
+    @Override
+    public PageInfo<TSysActivity> pageListApp(TSysActivityQuery query) {
         PageInfo<TSysActivity> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
-        List<TSysActivity> list = this.baseMapper.pageList(query,pageInfo);
+        List<TSysActivity> list = this.baseMapper.pageListApp(query,pageInfo);
         pageInfo.setRecords(list);
         return pageInfo;
     }

--
Gitblit v1.7.1