From 95f03f9a354ecd2b68e1aab03a51e8d740bd597e Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Fri, 19 Jan 2024 21:20:35 +0800 Subject: [PATCH] init --- .../com/ruoyi/cai/manager/UserForbidManager.java | 2 +- .../src/main/java/com/ruoyi/cai/mq/AmqpProducer.java | 7 ++++--- ...onsumer.java => CalculateSalesQueueConsumer.java} | 12 +----------- .../ruoyi/cai/mq/consumer/CommonDelayMqConsumer.java | 3 +-- .../com/ruoyi/cai/mq/{ => dto}/CommonDelayDto.java | 2 +- .../cai/service/impl/UserForbidServiceImpl.java | 2 +- 6 files changed, 9 insertions(+), 19 deletions(-) rename ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/{AmqpConsumer.java => CalculateSalesQueueConsumer.java} (77%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/mq/{ => dto}/CommonDelayDto.java (85%) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java index 7b14302d..a5111b94 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpProducer.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpProducer.java index 0a6e1556..3a4afb11 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpProducer.java +++ b/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), diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/AmqpConsumer.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CalculateSalesQueueConsumer.java similarity index 77% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/AmqpConsumer.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CalculateSalesQueueConsumer.java index a6711ec7..a6ea4792 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/AmqpConsumer.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonDelayMqConsumer.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonDelayMqConsumer.java index 9697778b..292db811 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonDelayMqConsumer.java +++ b/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.CommonDelayDto; +import com.ruoyi.cai.mq.dto.CommonDelayDto; import com.ruoyi.cai.mq.CommonDelayMqConfig; import com.ruoyi.cai.ws.job.CheckTimeOutJob; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/CommonDelayDto.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/dto/CommonDelayDto.java similarity index 85% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mq/CommonDelayDto.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mq/dto/CommonDelayDto.java index 06bce1d8..11e9e209 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/CommonDelayDto.java +++ b/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; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java index 2e10e313..a17b0a16 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java +++ b/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;