Merge branch 'feat-1001863' into 'master'

把关键词相应和入群欢迎语的关键词校验是否个人号去掉

See merge request rays/pcloud-book!227

pcloud-service-book/src/main/java/com/pcloud/book/group/tools/SendWeixinRequestTools.java

@@ -320,7 +320,6 @@ public class SendWeixinRequestTools {
         String robotId = dto.getRobotId();
         String weixinGroupId = dto.getWeixinGroupId();
         Boolean isHaveKeywords = dto.getIsHaveKeywords();
-        Boolean isGroupRobot = dto.getIsGroupRobot();
         List<KeywordDTO> keywords = dto.getKeywords();
         KeywordStatusDTO keywordStatusDTO = dto.getDto();
         GroupClassifyQrcodeDTO classifyQrcodeInfo = dto.getClassifyQrcodeInfo();
@@ -336,7 +335,7 @@ public class SendWeixinRequestTools {
             content.append("本群目的为学习交流和学习辅导，线上资源和工具为图书的增值服务，可根据实际情况配合图书一起使用。");
         }
         StringBuilder sb = new StringBuilder();
-        boolean isOld = createGuideMessageBase(isGroupRobot, keywords, classifyQrcodeInfo, sb, dto.getAccountSettingDto(), content.length());
+        boolean isOld = createGuideMessageBase(keywords, classifyQrcodeInfo, sb, dto.getAccountSettingDto(), content.length());
         StringBuilder groupKeyword = createGroupKeyword(keywordStatusDTO, classifyQrcodeInfo, sb, isOld, dto.getAccountSettingDto());
         // 1001692 自定义欢迎语+关键词文案，如果超过300字，关键词拆分出来发
         if ((content.length() + sb.length()) >= 1000) {
@@ -355,7 +354,6 @@ public class SendWeixinRequestTools {
         List<ReplyMessageVO> replyMessages = dto.getReplyMessages();
         String robotId = dto.getRobotId();
         String weixinGroupId = dto.getWeixinGroupId();
-        Boolean isGroupRobot = dto.getIsGroupRobot();
         List<KeywordDTO> keywords = dto.getKeywords();
         KeywordStatusDTO keywordStatusDTO = dto.getDto();
         GroupClassifyQrcodeDTO classifyQrcodeInfo = dto.getClassifyQrcodeInfo();
@@ -372,7 +370,7 @@ public class SendWeixinRequestTools {
                 if (ReplyTypeEnum.TEXT.value.equals(sendMessageDTO.getReplyType())) {
                     String s = nickNameStr + " " + sendMessageDTO.getContent();
                     StringBuilder sb = new StringBuilder();
-                    boolean isOld = createGuideMessageBase(isGroupRobot, keywords, classifyQrcodeInfo, sb, dto.getAccountSettingDto(), s.length());
+                    boolean isOld = createGuideMessageBase(keywords, classifyQrcodeInfo, sb, dto.getAccountSettingDto(), s.length());
                     StringBuilder groupKeyword = createGroupKeyword(keywordStatusDTO, classifyQrcodeInfo, sb, isOld, dto.getAccountSettingDto());
                     // 1001692 自定义欢迎语+关键词文案，如果超过300字，关键词拆分出来发
                     if (s.length() + groupKeyword.length() >= 1000) {
@@ -401,9 +399,9 @@ public class SendWeixinRequestTools {
     }
 
 
-    private static boolean createGuideMessageBase(Boolean isGroupRobot, List<KeywordDTO> keywords, GroupClassifyQrcodeDTO classifyQrcodeInfo, StringBuilder sb, AccountSettingDto accountSettingDto, int length) {
+    private static boolean createGuideMessageBase(List<KeywordDTO> keywords, GroupClassifyQrcodeDTO classifyQrcodeInfo, StringBuilder sb, AccountSettingDto accountSettingDto, int length) {
         boolean isOld = true;
-        boolean haveKeyword = !CollectionUtils.isEmpty(keywords) && isGroupRobot;
+        boolean haveKeyword = !CollectionUtils.isEmpty(keywords);
         if (haveKeyword) {
             List<KeywordDTO> collect = keywords.stream()
                     .filter(p -> (ReplyTypeEnum.IMAGE.value.equals(p.getReplyType()) || ReplyTypeEnum.TEXT.value.equals(p.getReplyType())))

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

@@ -394,8 +394,6 @@ public class BookGuideBizImpl implements BookGuideBiz {
         //获取关键词信息（改成10个了，20190911周磊改成不限制了，但是开发要求必须要加限制，所以先限制40个） 刘娜需求 1001282 群不推送关键词
         List<KeywordDTO> keywords = bookKeywordBiz.listFiveKeyword(classifyQrcodeInfo.getClassifyId(), classifyQrcodeInfo.getBookGroupId());
         Boolean isHaveKeywords = !ListUtils.isEmpty(keywords);
-        final Boolean groupRobot = wechatGroupConsr.isGroupRobot(robotId);
-        log.info("[wechatGroupConsr.isGroupRobot] robotId:{} groupRobot:{}", robotId, groupRobot);
         //如果设置了群学习报告，加一个群学习报告的关键词
         KeywordStatusDTO dto = pushLearningReport(classifyQrcodeInfo, robotId, weixinGroupId, pushAddUserMessageDTO.getIp());
         AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(classifyQrcodeInfo.getChannelId());
@@ -410,7 +408,6 @@ public class BookGuideBizImpl implements BookGuideBiz {
             sendGuideMessageDTO.setRobotId(robotId);
             sendGuideMessageDTO.setWeixinGroupId(weixinGroupId);
             sendGuideMessageDTO.setIsHaveKeywords(isHaveKeywords);
-            sendGuideMessageDTO.setIsGroupRobot(groupRobot);
             sendGuideMessageDTO.setKeywords(keywords);
             sendGuideMessageDTO.setDto(dto);
             sendGuideMessageDTO.setIp(pushAddUserMessageDTO.getIp());
@@ -425,7 +422,6 @@ public class BookGuideBizImpl implements BookGuideBiz {
             sendGuideMessageDTO.setReplyMessages(replyMessages);
             sendGuideMessageDTO.setRobotId(robotId);
             sendGuideMessageDTO.setWeixinGroupId(weixinGroupId);
-            sendGuideMessageDTO.setIsGroupRobot(groupRobot);
             sendGuideMessageDTO.setKeywords(keywords);
             sendGuideMessageDTO.setDto(dto);
             sendGuideMessageDTO.setIp(pushAddUserMessageDTO.getIp());

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

@@ -688,12 +688,6 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         final String content = sendTextDTO.getTextContent().trim();
         final String weixinGroupId = sendTextDTO.getWechatGroupId();
         String robotId = sendTextDTO.getWxId();
-        // 若非之前的机器人则不回复普通关键词
-        final Boolean groupRobot = wechatGroupConsr.isGroupRobot(robotId);
-        log.info("[wechatGroupConsr.isGroupRobot] robotId:{} groupRobot:{}", robotId, groupRobot);
-        if (!groupRobot) {
-            return;
-        }
         //通过群id获取对应基本信息
         GroupClassifyQrcodeDTO classifyQrcodeInfo = bookGroupClassifyBiz.getClassifyQrcodeInfo(weixinGroupId);
         if (classifyQrcodeInfo == null) {