From 3ae5f86787af4dca085e3013802c29b20a2a9d20 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 15 九月 2025 09:30:43 +0800 Subject: [PATCH] 供应商erp --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java index c5456e0..62b5b0e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java @@ -3,7 +3,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.ImmutableMap; import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.system.mapper.TSysLiveMapper; import com.ruoyi.system.model.TSysEducationalInfo; @@ -14,7 +16,9 @@ import com.ruoyi.system.task.base.TimeJobType; import com.ruoyi.system.task.jobs.LivePushJob; import com.ruoyi.system.vo.TSysLiveVO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.util.Date; @@ -32,6 +36,9 @@ */ @Service public class TSysLiveServiceImpl extends ServiceImpl<TSysLiveMapper, TSysLive> implements TSysLiveService { + + @Autowired + private RedisCache redisCache; @Override public R pushUser(String id, String pushType) { @@ -63,6 +70,9 @@ public PageInfo<TSysLiveVO> pageList(TSysLiveQuery query) { PageInfo<TSysLiveVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TSysLiveVO> list = this.baseMapper.pageList(query,pageInfo); + if (CollectionUtils.isEmpty(list)){ + return pageInfo; + } // 判断状态 for (TSysLiveVO sysLive : list) { if(sysLive.getStartTime().isAfter(LocalDateTime.now())){ @@ -74,6 +84,9 @@ if(sysLive.getEndTime().isBefore(LocalDateTime.now())){ sysLive.setLiveStatus(3); } + // 查看是否包含该值 + boolean memberInSet = redisCache.isMemberInSet(Constants.LIVE_APPOINTMENT_PUSH + sysLive.getId(), query.getAppUserId()); + sysLive.setAppointmentStatus(memberInSet ? 2 : 1); } pageInfo.setRecords(list); return pageInfo; -- Gitblit v1.7.1