init

ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java

@@ -9,7 +9,7 @@ import com.ruoyi.cai.dto.admin.query.UserForbidReq;
 import com.ruoyi.cai.enums.ForbidTimeEnum;
 import com.ruoyi.cai.enums.ForbidTypeEnum;
 import com.ruoyi.cai.mq.AmqpProducer;
-import com.ruoyi.cai.mq.CommonDelayDto;
+import com.ruoyi.cai.mq.dto.CommonDelayDto;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.Data;

ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpProducer.java

@@ -1,7 +1,8 @@
 package com.ruoyi.cai.mq;
 
 import com.alibaba.fastjson.JSON;
-import com.ruoyi.cai.mq.consumer.AmqpConsumer;
+import com.ruoyi.cai.mq.consumer.CalculateSalesQueueConsumer;
+import com.ruoyi.cai.mq.dto.CommonDelayDto;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -12,7 +13,7 @@ public class AmqpProducer {
     private RabbitTemplate rabbitTemplate;
 
     public void sendCalculateSales(String message){
-        rabbitTemplate.convertAndSend(AmqpConsumer.CALCULATE_SALES_EXCHANGE, AmqpConsumer.CALCULATE_SALES_KEY, message);
+        rabbitTemplate.convertAndSend(CalculateSalesQueueConsumer.CALCULATE_SALES_EXCHANGE, CalculateSalesQueueConsumer.CALCULATE_SALES_KEY, message);
     }
 
     public void sendCheckTimeOut(String message,Integer timeout){
@@ -25,7 +26,7 @@ public class AmqpProducer {
                 });
     }
 
-    public void sendCommonDelayMq(CommonDelayDto dto,Integer timeout){
+    public void sendCommonDelayMq(CommonDelayDto dto, Integer timeout){
         rabbitTemplate.convertAndSend(CommonDelayMqConfig.EXCHANGE_NAME,
                 CommonDelayMqConfig.ROUTING_KEY,
                 JSON.toJSONString(dto),

ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CalculateSalesQueueConsumer.java

@@ -1,7 +1,6 @@
 package com.ruoyi.cai.mq.consumer;
 
 import com.ruoyi.cai.service.ConsumeLogService;
-import com.ruoyi.cai.ws.service.SettleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
@@ -12,22 +11,13 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
-public class AmqpConsumer {
+public class CalculateSalesQueueConsumer {
 
     public final static String CALCULATE_SALES_QUEUE = "calculateSalesQueue";
     public final static String CALCULATE_SALES_EXCHANGE = "calculateSalesExchange";
     public final static String CALCULATE_SALES_KEY = "calculateSalesKey";
 
 
-    /**
-     * queuesToDeclare：支持多个队列，将队列绑定到默认交换机上，routeKey为队列名称。
-     * @param msg 接收到的消息
-     */
-    /**@RabbitListener(queuesToDeclare = @Queue(value = "testQueue"),containerFactory = "customContainerFactory")
-    public void listener(String msg) {
-        System.out.println(msg);
-    }*/
-
     @Autowired
     private ConsumeLogService consumeLogService;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonDelayMqConsumer.java

@@ -2,8 +2,7 @@ package com.ruoyi.cai.mq.consumer;
 
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.cai.manager.UserForbidManager;
-import com.ruoyi.cai.mq.AmqpProducer;
+import com.ruoyi.cai.mq.dto.CommonDelayDto;
-import com.ruoyi.cai.mq.CommonDelayDto;
 import com.ruoyi.cai.mq.CommonDelayMqConfig;
 import com.ruoyi.cai.ws.job.CheckTimeOutJob;
 import lombok.extern.slf4j.Slf4j;

ruoyi-cai/src/main/java/com/ruoyi/cai/mq/dto/CommonDelayDto.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.mq;
+package com.ruoyi.cai.mq.dto;
 
 import lombok.Data;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java

@@ -14,7 +14,7 @@ import com.ruoyi.cai.enums.ForbidTypeEnum;
 import com.ruoyi.cai.manager.ForbidCache;
 import com.ruoyi.cai.mapper.UserForbidMapper;
 import com.ruoyi.cai.mq.AmqpProducer;
-import com.ruoyi.cai.mq.CommonDelayDto;
+import com.ruoyi.cai.mq.dto.CommonDelayDto;
 import com.ruoyi.cai.service.AnchorService;
 import com.ruoyi.cai.service.UserForbidService;
 import com.ruoyi.cai.service.UserService;