Merge branch 'zyj-replyRedis' into 'master'

不重复回复

See merge request rays/pcloud-book!413

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookKeywordBizImpl.java

@@ -693,7 +693,15 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         }
         if (pcloudKeyword!=null){
             //走关键词
-            log.info("查询平台端关键词"+pcloudKeyword.toString());
+            log.info("查询平台端关键词"+pcloudKeyword.toString()+"id="+pcloudKeyword.getId());
+            //3min不回复同一关键词
+            String key ="BOOK:PCLOUD_KEYWORD:" + userWxId + "-" +robotId + "-" + pcloudKeyword.getId();
+            String redisContent = JedisClusterUtils.getJson(key, String.class);
+            if (!StringUtil.isEmpty(redisContent)){
+                return;
+            }else {
+                JedisClusterUtils.setJson(key, userWxId, 3*60);
+            }
             List<PcloudKeywordReply> replies = pcloudKeywordReplyDao.getByRelevance(RelevanceTypeEnum.KEYWORD.value, pcloudKeyword.getId());
             if (MethodEnum.RANDOM.value.equals(pcloudKeyword.getMethod())){
                 int a= (int) Math.floor(Math.random()*replies.size());
@@ -1032,6 +1040,14 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
     @ParamLog("非关键词响应")
     @Override
     public void sendPcloudNotKeyWord(String userWxId, String ip, Integer code, String robotId,Long pcloudClassifyId) {
+        //1min不重复回复
+        String key ="BOOK:PCLOUD_NOT_KEYWORD:"+ userWxId +"-" + robotId +"-" + pcloudClassifyId;
+        String redisContent = JedisClusterUtils.getJson(key, String.class);
+        if (!StringUtil.isEmpty(redisContent)){
+            return;
+        }else {
+            JedisClusterUtils.setJson(key, userWxId,  60);
+        }
         //走非关键词
         List<PcloudNotKeyword> notKeywords = pcloudNotKeywordDao.getPcloudNotKeywordList(pcloudClassifyId);
         if (!ListUtils.isEmpty(notKeywords)){

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

@@ -6,6 +6,7 @@ import com.pcloud.book.pcloudkeyword.dao.PcloudRobotDao;
 import com.pcloud.book.pcloudkeyword.entity.PcloudRobot;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.exceptions.BizException;
+import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.wechatgroup.message.dto.SendNotTextDTO;
 import lombok.extern.slf4j.Slf4j;