From d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 十月 2025 18:16:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 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..3b15301 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,8 +3,12 @@
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.listener.PublishTopicLiveInfoEventListener;
+import com.ruoyi.system.listener.event.PublishTopicLiveInfoEvent;
import com.ruoyi.system.mapper.TSysLiveMapper;
import com.ruoyi.system.model.TSysEducationalInfo;
import com.ruoyi.system.model.TSysLive;
@@ -13,14 +17,16 @@
import com.ruoyi.system.task.base.QuartzManager;
import com.ruoyi.system.task.base.TimeJobType;
import com.ruoyi.system.task.jobs.LivePushJob;
+import com.ruoyi.system.utils.util.TemplateMessageSendUtil;
+import com.ruoyi.system.vo.TSysActivityVO;
import com.ruoyi.system.vo.TSysLiveVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
/**
* <p>
@@ -33,6 +39,10 @@
@Service
public class TSysLiveServiceImpl extends ServiceImpl<TSysLiveMapper, TSysLive> implements TSysLiveService {
+ @Autowired
+ private RedisCache redisCache;
+ @Autowired
+ private ApplicationContext applicationContext;
@Override
public R pushUser(String id, String pushType) {
TSysLive sysLive = this.getById(id);
@@ -43,18 +53,8 @@
}
sysLive.setPushType(pushType);
this.updateById(sysLive);
- // 添加定时任务 直播开始推送
- Map<String, ? extends Object> maps =
- new ImmutableMap.Builder<String, String>().
- put("id", sysLive.getId())
- .build();
- QuartzManager.addJob(
- LivePushJob.class,
- (LivePushJob.name+sysLive.getId()).toUpperCase(),
- TimeJobType.LIVE_PUSH,
- DateUtils.localDateTimeToDate(sysLive.getStartTime()),
- maps
- );
+ // 直播开始推送公众号消息
+ applicationContext.publishEvent(new PublishTopicLiveInfoEvent(pushType+"_"+id));
}
return R.ok();
}
@@ -63,6 +63,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 +77,43 @@
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);
+
+ if(query.getRoleType() == 5){
+ Long userId = query.getUserId();
+ Set<Long> cacheSet = redisCache.getCacheSet(Constants.SYS_ACTIVITY_CLICK_COUNT + sysLive.getId());
+ if(cacheSet.contains(userId)){
+ sysLive.setIsView(true);
+ }
+ }
+
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+ @Override
+ public PageInfo<TSysLiveVO> pageListApp(TSysLiveQuery query) {
+ PageInfo<TSysLiveVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TSysLiveVO> list = this.baseMapper.pageListApp(query,pageInfo);
+ if (CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+ // 判断状态
+ for (TSysLiveVO sysLive : list) {
+ if(sysLive.getStartTime().isAfter(LocalDateTime.now())){
+ sysLive.setLiveStatus(1);
+ }
+ if(sysLive.getStartTime().isBefore(LocalDateTime.now()) && sysLive.getEndTime().isAfter(LocalDateTime.now())){
+ sysLive.setLiveStatus(2);
+ }
+ 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