发送欢迎语不走topic

pcloud-service-book/src/main/java/com/pcloud/book/BookApplication.java

@@ -143,16 +143,6 @@ public class BookApplication {
     }
 
     @Bean
-    public Queue pushAddUserMessage() {
-        return RabbitMQFactory.queueBuilder(MQTopicConumer.PUSH_ADD_USER_MESSAGE);
-    }
-
-    @Bean
-    public Binding pushAddUserMessageBind() {
-        return RabbitMQFactory.bindingExchange(pushAddUserMessage(), MQTopicProducer.PUSH_ADD_USER_MESSAGE);
-    }
-
-    @Bean
     public Queue updateWXGroupNameQueue() {
         return RabbitMQFactory.queueBuilder(MQTopicConumer.UPDATE_WXGROUP_NAME);
     }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/GroupQrcodeBizImpl.java

@@ -41,6 +41,7 @@ import com.pcloud.book.group.vo.GroupQrcodeBookVO;
 import com.pcloud.book.group.vo.ListGroupQrcodeResponseVO;
 import com.pcloud.book.group.vo.ListQrcodeByClassifyParamVO;
 import com.pcloud.book.group.vo.UpdateGroupQrcodeRequestVO;
+import com.pcloud.book.keywords.biz.BookGuideBiz;
 import com.pcloud.book.keywords.dao.BookKeywordRecordDao;
 import com.pcloud.book.keywords.dto.KeywordUserCountDTO;
 import com.pcloud.book.mq.producer.BookMQProducer;
@@ -70,7 +71,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -99,7 +99,7 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
     @Autowired
     private WechatGroupConsr wechatGroupConsr;
     @Autowired
-    private BookMQProducer bookMQProducer;
+    private BookGuideBiz bookGuideBiz;
     @Autowired
     private BookKeywordRecordDao bookKeywordRecordDao;
     @Autowired
@@ -495,7 +495,6 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
         } else {
             return;
         }
-        LOGGER.info("【发送欢迎语消息】，topic发送开始");
         PushAddUserMessageDTO pushAddUserMessageDTO = new PushAddUserMessageDTO();
         pushAddUserMessageDTO.setWeixinGroupId(weixinGroupId);
         pushAddUserMessageDTO.setTime(System.currentTimeMillis());
@@ -503,8 +502,7 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
         pushAddUserMessageDTO.setMemberCount(memberCount);
         pushAddUserMessageDTO.setRobotId(robotIdByGroupId);
         pushAddUserMessageDTO.setIp(ip);
-        bookMQProducer.pushAddUserMessageTopic(pushAddUserMessageDTO);
-        LOGGER.info("【发送欢迎语消息】，topic发送结束");
+        bookGuideBiz.sendGuideMessage(pushAddUserMessageDTO);
     }
 
 

pcloud-service-book/src/main/java/com/pcloud/book/mq/config/MQTopicConumer.java

@@ -46,11 +46,6 @@ public class MQTopicConumer {
     public static final String WXGROUP_SEND_TEXT = PREFIX + MQTopicProducer.WXGROUP_SEND_TEXT;
 
     /**
-     * 发送文本消息
-     */
-    public static final String PUSH_ADD_USER_MESSAGE = PREFIX + MQTopicProducer.PUSH_ADD_USER_MESSAGE;
-
-    /**
      * 修改微信群名称
      */
     public static final String UPDATE_WXGROUP_NAME = PREFIX + MQTopicProducer.UPDATE_WXGROUP_NAME;

pcloud-service-book/src/main/java/com/pcloud/book/mq/producer/BookMQProducer.java

@@ -3,7 +3,6 @@ package com.pcloud.book.mq.producer;
 import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
 import com.pcloud.book.book.dto.BookNameUpdateDTO;
 import com.pcloud.book.clock.dto.PushBookClockKeywordDTO;
-import com.pcloud.book.group.dto.PushAddUserMessageDTO;
 
 public interface BookMQProducer {
 
@@ -11,7 +10,5 @@ public interface BookMQProducer {
 
   void sendUpdateBookNameTopic(BookNameUpdateDTO bookNameUpdateDTO);
 
-  void pushAddUserMessageTopic(PushAddUserMessageDTO pushAddUserMessageDTO);
-
   void pushBookClockKeyword(PushBookClockKeywordDTO pushBookClockKeywordDTO);
 }

pcloud-service-book/src/main/java/com/pcloud/book/mq/producer/impl/BookProducerImpl.java

@@ -3,7 +3,6 @@ package com.pcloud.book.mq.producer.impl;
 import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
 import com.pcloud.book.book.dto.BookNameUpdateDTO;
 import com.pcloud.book.clock.dto.PushBookClockKeywordDTO;
-import com.pcloud.book.group.dto.PushAddUserMessageDTO;
 import com.pcloud.book.mq.producer.BookMQProducer;
 import com.pcloud.common.core.constant.MQTopicProducer;
 
@@ -29,11 +28,6 @@ public class BookProducerImpl implements BookMQProducer {
     }
 
     @Override
-    public void pushAddUserMessageTopic(PushAddUserMessageDTO pushAddUserMessageDTO) {
-        amqpTemplate.convertAndSend(MQTopicProducer.EXCHAGE, MQTopicProducer.PUSH_ADD_USER_MESSAGE, pushAddUserMessageDTO);
-    }
-
-    @Override
     public void pushBookClockKeyword(PushBookClockKeywordDTO pushBookClockKeywordDTO) {
         amqpTemplate.convertAndSend(MQTopicProducer.EXCHAGE, MQTopicProducer.PUSH_BOOK_CLOCK_KEYWORD, pushBookClockKeywordDTO);
     }

pcloud-service-book/src/main/java/com/pcloud/book/mq/topic/PushAddUserMessageListemer.java

-package com.pcloud.book.mq.topic;
-
-import com.pcloud.book.group.dto.PushAddUserMessageDTO;
-import com.pcloud.book.keywords.biz.BookGuideBiz;
-import com.pcloud.book.mq.config.MQTopicConumer;
-import com.pcloud.common.core.aspect.ParamLog;
-import com.pcloud.common.exceptions.BizException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @author lily
- * @date 2019/5/8 14:55
- */
-@RabbitListener(queues = MQTopicConumer.PUSH_ADD_USER_MESSAGE)
-@Component
-public class PushAddUserMessageListemer {
-    private static final Logger LOGGER = LoggerFactory.getLogger(PushAddUserMessageListemer.class);
-
-
-    @Autowired
-    private BookGuideBiz bookGuideBiz;
-
-    /**
-     * 发送欢迎语消息
-     */
-    @ParamLog("发送欢迎语消息")
-    @RabbitHandler
-    public void onMessage(PushAddUserMessageDTO pushAddUserMessageDTO) throws BizException {
-        try {
-            long time = System.currentTimeMillis() - pushAddUserMessageDTO.getTime();
-            if (time < 5000) {
-                Thread.sleep(5000 - time);
-            }
-            bookGuideBiz.sendGuideMessage(pushAddUserMessageDTO);
-        } catch (Exception e) {
-            LOGGER.error("发送欢迎语消息失败" + e.getMessage(), e);
-        }
-    }
-}