Merge branch 'fix-rsy' into 'master'

修改非关键词bug

See merge request rays/pcloud-book!440

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

@@ -2,8 +2,10 @@ package com.pcloud.book.mq.topic;
 
 import com.pcloud.book.keywords.biz.BookKeywordBiz;
 import com.pcloud.book.mq.config.MQTopicConumer;
+import com.pcloud.book.pcloudkeyword.dao.PcloudKeywordClassifyDao;
 import com.pcloud.book.pcloudkeyword.dao.PcloudRobotClassifyDao;
 import com.pcloud.book.pcloudkeyword.dao.PcloudRobotDao;
+import com.pcloud.book.pcloudkeyword.entity.PcloudKeywordClassify;
 import com.pcloud.book.pcloudkeyword.entity.PcloudRobot;
 import com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify;
 import com.pcloud.common.core.aspect.ParamLog;
@@ -32,6 +34,8 @@ public class WxGroupSendNotTextListener {
     private PcloudRobotDao pcloudRobotDao;
     @Autowired
     private PcloudRobotClassifyDao pcloudRobotClassifyDao;
+    @Autowired
+    private PcloudKeywordClassifyDao pcloudKeywordClassifyDao;
 
     @ParamLog("接收用户发送非文本消息")
     @RabbitHandler
@@ -59,6 +63,11 @@ public class WxGroupSendNotTextListener {
                     return;
                 }
                 Long pcloudClassifyId=robotClassify.getKeywordClassifyId();
+                PcloudKeywordClassify pcloudKeywordClassify = pcloudKeywordClassifyDao.getById(pcloudClassifyId);
+                if (null == pcloudKeywordClassify || !pcloudKeywordClassify.getOpen()){//分类未启用
+                    log.info("查询小号关键词分类为空或未启用pcloudClassifyId="+pcloudClassifyId);
+                    return;
+                }
                 bookKeywordBiz.sendPcloudNotKeyWord(userWxId,ip,code,robotId,pcloudClassifyId,sendNotTextDTO.getMessageType());
             }