From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java
index 6f84050..572ce5c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java
@@ -4,9 +4,12 @@
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.constant.DelayTaskEnum;
+import com.ruoyi.system.api.service.RemoteActivityService;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteCouponService;
-import lombok.extern.slf4j.Slf4j;
+import com.ruoyi.system.api.service.RemoteGoodsService;
+import com.ruoyi.system.api.service.RemoteOrderService;
+import lombok.extern.log4j.Log4j2;
import org.springframework.data.redis.connection.Message;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -14,6 +17,7 @@
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.Date;
/**
@@ -23,15 +27,26 @@
* @date 2023年06月06日
* @version: 1.0
*/
-@Slf4j
+@Log4j2
@Component
public class RedisListener extends KeyExpirationEventMessageListener {
private RedisTemplate<String, Object> redisTemplate;
+ @Resource
private RemoteConfigService remoteConfigService;
+ @Resource
private RemoteCouponService remoteCouponService;
+
+ @Resource
+ private RemoteActivityService remoteActivityService;
+
+ @Resource
+ private RemoteOrderService remoteOrderService;
+
+ @Resource
+ private RemoteGoodsService remoteGoodsService;
public RedisListener(RedisMessageListenerContainer listenerContainer,
RedisTemplate redisTemplate) {
@@ -51,9 +66,21 @@
String[] split = expiredKey.split("-");
String operation=split[0];
if(DelayTaskEnum.COUPON_SEND_DELAY_TASK.getCode().equals(operation)){
- //自动关闭订单
+ //自动发送优惠券
autoTimeSendCoupon(split[1]);
+ }else if(DelayTaskEnum.ACTIVITY_START_TASK.getCode().equals(operation)){
+ //自动开始任务
+ autoStartActivity(split[1]);
+ }else if(DelayTaskEnum.ACTIVITY_END_TASK.getCode().equals(operation)){
+ //自动结束任务
+ autoEndActivity(split[1]);
+ }else if(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode().equals(operation)){
+ //自动结束任务
+ autoCancelOrder(split[1]);
+ } else if (DelayTaskEnum.LIVE_APPOINTMENT_TASK.getCode().equals(operation)) {
+ push(Long.valueOf(split[1]));
}
+
//删除失效的key
redisTemplate.delete(expiredKey);
}
@@ -61,6 +88,16 @@
}catch (Exception e){
e.printStackTrace();
}
+ }
+
+ /**
+ * 推送消息
+ * @param appointmentId
+ */
+ private void push(Long appointmentId) {
+ remoteGoodsService.push(appointmentId);
+ //删除定时任务
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.LIVE_APPOINTMENT_TASK.getCode()+"-"+appointmentId);
}
public <T> T getAndSet(final String key, T value){
@@ -83,5 +120,24 @@
remoteConfigService.deleteDelayTask(DelayTaskEnum.COUPON_SEND_DELAY_TASK.getCode()+"-"+couponId);
}
+ private void autoStartActivity(String activityId){
+ log.info("autoStartActivity scheduler task is running :" + activityId);
+ remoteActivityService.startActivity(activityId);
+ //删除定时任务
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode()+"-"+activityId);
+ }
+ private void autoEndActivity(String activityId){
+ log.info("autoEndActivity scheduler task is running :" + activityId);
+ remoteActivityService.endActivity(activityId);
+ //删除定时任务
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_END_TASK.getCode()+"-"+activityId);
+ }
+
+ private void autoCancelOrder(String orderId){
+ log.info("autoCancelOrder scheduler task is running :" + orderId);
+ remoteOrderService.autoCancelOrder(orderId);
+ //删除定时任务
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode()+"-"+orderId);
+ }
}
--
Gitblit v1.7.1