From 03f1f3372a10a08f96f3308bfa099e86a55046d0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 30 一月 2024 09:32:38 +0800
Subject: [PATCH] 修改数据权限bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java |   46 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 43 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..b852a0e 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,11 @@
 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.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 +16,7 @@
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.Date;
 
 /**
@@ -23,15 +26,23 @@
  * @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;
 
     public RedisListener(RedisMessageListenerContainer listenerContainer,
                          RedisTemplate redisTemplate) {
@@ -51,9 +62,19 @@
                     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]);
                     }
+
                     //删除失效的key
                     redisTemplate.delete(expiredKey);
                 }
@@ -83,5 +104,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