修改个人机器人触发关键词的bug

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

@@ -25,6 +25,7 @@ import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.enums.TouchTypeEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.group.vo.ClassifyNameVO;
+import com.pcloud.book.group.vo.GroupQrcodeBaseInfoVO;
 import com.pcloud.book.keywords.biz.BookKeywordBiz;
 import com.pcloud.book.keywords.dao.BookKeywordDao;
 import com.pcloud.book.keywords.dao.BookKeywordRecordDao;
@@ -425,12 +426,14 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
             this.sendKeywordMessageToGroup(content, weixinGroupId, userWxId, robotId, ip, code);
             return;
         }
+        //消息为个人机器人消息时，其实weixinGroupId是机器人id
+        String altId = weixinGroupId;
         //简单过滤非关键词的词
         if (StringUtil.isEmpty(content) || content.length() > 20) {
             return;
         }
         // TODO 根据小号和用户id获取所有相关的分类id，若该关键词存在多本书，则组装成文本加链接一次发送
-        final List<JoinGroupCipherDTO> dtos = bookGroupBiz.getClassifyIdsByWxIdAndAltId(weixinGroupId, robotId);
+        final List<JoinGroupCipherDTO> dtos = bookGroupBiz.getClassifyIdsByWxIdAndAltId(altId, robotId);
         if (CollectionUtils.isEmpty(dtos)) {
             log.info("[关键词消息回复] classifyIds is null");
             return;
@@ -469,40 +472,42 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         final Map<Long, GroupClassifyQrcodeDTO> classifyMap = qrcodeDTOS.stream().collect(Collectors.toMap(GroupClassifyQrcodeDTO::getClassifyId, p -> p, (v1, v2) -> v2));
         // 记录循环插入，消息一条发送
         for (ReplyKeywordDTO replyKeywordDTO : replyKeywordDTOs) {
-            log.info("[关键词回复原始数据] ： sendKeywordMessage replyKeywordDTO ：{}, robotId:{}, weixinGroupId:{}", replyKeywordDTO, robotId, weixinGroupId);
+            log.info("[关键词回复原始数据] ： sendKeywordMessage replyKeywordDTO ：{}, robotId:{}, altId:{}", replyKeywordDTO, robotId, altId);
             // 处理链接地址
             Long classifyId = keywordClassifyIdMap.get(replyKeywordDTO.getKeywordId());
             final GroupClassifyQrcodeDTO dto = classifyMap.get(classifyId);
+            Long qrcodeId = classifyToQrcodeMap.get(dto.getClassifyId());
+            GroupQrcodeBaseInfoVO qrcodeInfo = groupQrcodeDao.getBaseById(qrcodeId);
             if (ReplyTypeEnum.APP.value.equals(replyKeywordDTO.getReplyType()) || ReplyTypeEnum.LINK.value.equals(replyKeywordDTO.getReplyType())) {
                 if(null == dto) {
                     log.info("[关键词消息回复] 分类信息为空 replyKeywordDTO：{}; classifyMap:{}", replyKeywordDTO, classifyMap);
                     continue;
                 }
                 AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(dto.getChannelId());
-                String linkUrl = SendWeixinRequestTools.splitUrlNew(accountSettingDto, replyKeywordDTO.getLinkUrl(), dto.getBookGroupId(), dto.getClassifyId(), classifyToQrcodeMap.get(dto.getClassifyId()));
+                String linkUrl = SendWeixinRequestTools.splitUrlNew(accountSettingDto, replyKeywordDTO.getLinkUrl(), dto.getBookGroupId(), dto.getClassifyId(), qrcodeId);
                 replyKeywordDTO.setLinkUrl(linkUrl);
                 if (!StringUtil.isEmpty(linkUrl)) {
                     replyKeywordDTO.setShortLinkUrl(UrlUtils.getShortUrl4Own(linkUrl));
                 }
             }
-            String redisContent = JedisClusterUtils.getJson("BOOK:KEYWORD:" + weixinGroupId + "-" + replyKeywordDTO.getKeywordId(), String.class);
+            String redisContent = JedisClusterUtils.getJson("BOOK:KEYWORD:" + altId + "-" + replyKeywordDTO.getKeywordId(), String.class);
             // 同一群10秒内不回复同一关键词
-            if (insertBookKeywordRecord(weixinGroupId, userWxId, replyKeywordDTO, dto, redisContent)) {
+            if (insertBookKeywordRecord(qrcodeInfo.getWeixinGroupId(), userWxId, replyKeywordDTO, dto, redisContent)) {
                 return;
             }
             //获取推送消息机器人
             // 20190704改为收发一体
             if (StringUtil.isBlank(robotId)) {
-                log.info("[关键词消息回复] robotId is null content:{}, robotId:{},weixinGroupId:{}", content, robotId, weixinGroupId);
-                robotId = wechatGroupConsr.getRobotIdByGroupId(weixinGroupId);
+                log.info("[关键词消息回复] robotId is null content:{}, robotId:{},weixinGroupId:{}", content, robotId, qrcodeInfo.getWeixinGroupId());
+                robotId = wechatGroupConsr.getRobotIdByGroupId(qrcodeInfo.getWeixinGroupId());
             }
-            log.info("[关键词回复发送数据] ： sendKeywordMessage replyKeywordDTO ：{}, robotId:{}, weixinGroupId:{}", replyKeywordDTO, robotId, weixinGroupId);
+            log.info("[关键词回复发送数据] ： sendKeywordMessage replyKeywordDTO ：{}, robotId:{}, weixinGroupId:{}", replyKeywordDTO, robotId, qrcodeInfo.getWeixinGroupId());
             //新增关键词触发记录
-            addKeywordAppTouchRecord(replyKeywordDTO, weixinGroupId, dto.getClassifyId(), dto.getBookGroupId());
+            addKeywordAppTouchRecord(replyKeywordDTO, qrcodeInfo.getWeixinGroupId(), dto.getClassifyId(), dto.getBookGroupId());
         }
         // 单条还是按原来的发送
         if (replyKeywordDTOs.size() <= 1) {
-            SendWeixinRequestTools.sendKeywordMessage(replyKeywordDTOs.get(0), robotId, weixinGroupId, ip, code);
+            SendWeixinRequestTools.sendKeywordMessage(replyKeywordDTOs.get(0), robotId, altId, ip, code);
         } else {
             // 多条时文字，应用，链接组装成一条发送
             ReplyKeywordDTO d = new ReplyKeywordDTO();
@@ -513,13 +518,13 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
                 } else if (ReplyTypeEnum.TEXT.value.equals(dto.getReplyType())){
                     sb.append(dto.getKeywords()).append(":").append(dto.getContent()).append("\n");
                 } else if (ReplyTypeEnum.IMAGE.value.equals(dto.getReplyType())) {
-                    SendWeixinRequestTools.sendKeywordMessage(d, robotId, weixinGroupId, ip, code);
+                    SendWeixinRequestTools.sendKeywordMessage(d, robotId, altId, ip, code);
                     continue;
                 }
             }
             d.setContent(sb.toString());
             d.setReplyType(ReplyTypeEnum.TEXT.value);
-            SendWeixinRequestTools.sendKeywordMessage(d, robotId, weixinGroupId, ip, code);
+            SendWeixinRequestTools.sendKeywordMessage(d, robotId, altId, ip, code);
         }
     }
 
@@ -635,6 +640,12 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         bookKeywordRecord.setUserWxId(userWxId);
         bookKeywordRecord.setWeixinGroupId(weixinGroupId);
         bookKeywordRecord.setSend(isSend);
+        if (bookKeywordRecord.getGroupQrcodeId() == null) {
+            GroupQrcode groupQr = groupQrcodeDao.getGroupQrcodeByGroupId(weixinGroupId);
+            if (groupQr!=null){
+                bookKeywordRecord.setGroupQrcodeId(groupQr.getId());
+            }
+        }
         bookKeywordRecordDao.insert(bookKeywordRecord);
     }