qq机器人发送欢迎语

pcloud-service-book/pom.xml

@@ -30,6 +30,11 @@
 
 		<!--内部调用依赖-->
        <dependency>
+		   <groupId>com.dcg</groupId>
+		   <artifactId>CoolQSDK</artifactId>
+		   <version>1.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
 			<groupId>com.pcloud.common</groupId>
 			<artifactId>pcloud-common</artifactId>
 			<version>${pcloud-common.version}</version>

pcloud-service-book/src/main/java/com/pcloud/book/consumer/wechatgroup/WechatGroupConsr.java

 package com.pcloud.book.consumer.wechatgroup;
 
+import com.dcg.coolq.sdk.CoolQSDK;
+import com.dcg.coolq.sdk.message.vos.send.PrivateMsgSendVO;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.common.core.aspect.ParamLog;
@@ -70,6 +72,14 @@ public class WechatGroupConsr {
             throw new BookBizException(BookBizException.INVOKE_RES_ERROR, "服务内部错误，请稍后重试");
         }
     }
+    @ParamLog("qq机器人发送消息")
+    public void sendMessage4QQ(PrivateMsgSendVO privateMsgSendVO) {
+        try {
+            CoolQSDK.sendPrivateMsg(privateMsgSendVO);
+        } catch (Exception e) {
+            log.error("qq机器人给用户发送消息失败.[sendMessage]:" + e.getMessage(), e);
+        }
+    }
 
     @ParamLog("是否群机器人")
     public Boolean isGroupRobot(String robotWxId) {

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

@@ -56,7 +56,9 @@ import com.pcloud.book.keywords.vo.SetGuideVO;
 import com.pcloud.book.keywords.vo.UpdateGuideVO;
 import com.pcloud.book.pcloudkeyword.biz.PcloudRobotBiz;
 import com.pcloud.book.pcloudkeyword.dao.PcloudRobotDao;
+import com.pcloud.book.pcloudkeyword.dao.PcloudRobotWelcomeDao;
 import com.pcloud.book.pcloudkeyword.entity.PcloudRobot;
+import com.pcloud.book.pcloudkeyword.entity.PcloudRobotWelcome;
 import com.pcloud.book.personalstage.biz.PersonalStageBiz;
 import com.pcloud.book.personalstage.biz.PersonalStageJumpBiz;
 import com.pcloud.book.personalstage.constant.PersonalStageConstant;
@@ -150,6 +152,11 @@ public class BookGuideBizImpl implements BookGuideBiz {
     @Autowired
     private PersonalStageBiz personalStageBiz;
 
+    @Autowired
+    private PcloudRobotWelcomeDao pcloudRobotWelcomeDao;
+
+
+
     @Value("${wechat.group.link.prefix}")
     private String wechatGroupLinkPrefix;
     @Autowired
@@ -160,99 +167,100 @@ public class BookGuideBizImpl implements BookGuideBiz {
     @ParamLog("同意加好友发送欢迎语")
     @Override
     public void sendGuide(AgreeAddUserDTO agreeAddUserDTO) {
-        if(null == agreeAddUserDTO || StringUtil.isBlank(agreeAddUserDTO.getRobotWxId()) || StringUtil.isBlank(agreeAddUserDTO.getUserWxId())) {
-            log.info("[同意加好友发送欢迎语] 参数为空 agreeAddUserDTO：{}", agreeAddUserDTO);
-            return;
-        }
-        String cipher = agreeAddUserDTO.getCipher();
-        //如果暗号为空，表示直接加好友，需要发送统一欢迎语
-        if (cipher == null) {
-            //发送配置欢迎语 create by lihao 2020.2.7
-            //判断是否是平台端小号
-            PcloudRobot pcloudRobot = pcloudRobotDao.getByWxId(agreeAddUserDTO.getRobotWxId());
-            if (pcloudRobot!=null){
-                //删除需求单记录
-                personalStageJumpBiz.deletePaperRecord(agreeAddUserDTO.getRobotWxId(),agreeAddUserDTO.getUserWxId());
-                pcloudRobotBiz.sendWelcomeReply(agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
-                //好友引导语
-                sendFriendGuide(null, agreeAddUserDTO);
-                if (personalStageBiz.isPersonalStageUser(agreeAddUserDTO.getRobotWxId())){
-                    personalStageBiz.createAddUserStageUser(agreeAddUserDTO.getRobotWxId(),agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
+        if(agreeAddUserDTO.getRobotType()==null||agreeAddUserDTO.getRobotType()==1) {
+            if (null == agreeAddUserDTO || StringUtil.isBlank(agreeAddUserDTO.getRobotWxId()) || StringUtil.isBlank(agreeAddUserDTO.getUserWxId())) {
+                log.info("[同意加好友发送欢迎语] 参数为空 agreeAddUserDTO：{}", agreeAddUserDTO);
+                return;
+            }
+            String cipher = agreeAddUserDTO.getCipher();
+            //如果暗号为空，表示直接加好友，需要发送统一欢迎语
+            if (cipher == null) {
+                //发送配置欢迎语 create by lihao 2020.2.7
+                //判断是否是平台端小号
+                PcloudRobot pcloudRobot = pcloudRobotDao.getByWxId(agreeAddUserDTO.getRobotWxId());
+                if (pcloudRobot != null) {
+                    //删除需求单记录
+                    personalStageJumpBiz.deletePaperRecord(agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId());
+                    pcloudRobotBiz.sendWelcomeReply(agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
+                    //好友引导语
+                    sendFriendGuide(null, agreeAddUserDTO);
+                    if (personalStageBiz.isPersonalStageUser(agreeAddUserDTO.getRobotWxId())) {
+                        personalStageBiz.createAddUserStageUser(agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
+                    }
+                    return;
                 }
+                SendTextMessageVO vo = new SendTextMessageVO();
+                vo.setContent("终于和您见面了!\n请告诉我您在读哪本书？\n如果您在上一步中复制了暗号，\n您可以把暗号粘贴在下方对话框内，以微信聊天的形式发给我。" +
+                        "\n如果在上一步中，没有提示您复制暗号，\n您可以在【书中二维码旁】找到本书的简称及年份，\n在下方对话框内输入本书简称及年份，以微信聊天的形式发给我。");
+                vo.setCode(SendMessageTypeEnum.SELF.getCode());
+                vo.setWxId(agreeAddUserDTO.getRobotWxId());
+                vo.setAltId(agreeAddUserDTO.getRobotWxId());
+                vo.setWxGroupId(agreeAddUserDTO.getUserWxId());
+                vo.setIp(agreeAddUserDTO.getIp());
+                vo.setRobotProcessType(RobotProcessTypeEnum.WELCOME);
+                vo.setCounts(1);
+                vo.setIndex(0);
+                vo.setMessageGroupId(UUID.randomUUID().toString());
+                wechatGroupConsr.sendMessage(JSON.toJSONString(vo));
                 return;
             }
-            SendTextMessageVO vo = new SendTextMessageVO();
-            vo.setContent("终于和您见面了!\n请告诉我您在读哪本书？\n如果您在上一步中复制了暗号，\n您可以把暗号粘贴在下方对话框内，以微信聊天的形式发给我。" +
-                    "\n如果在上一步中，没有提示您复制暗号，\n您可以在【书中二维码旁】找到本书的简称及年份，\n在下方对话框内输入本书简称及年份，以微信聊天的形式发给我。");
-            vo.setCode(SendMessageTypeEnum.SELF.getCode());
-            vo.setWxId(agreeAddUserDTO.getRobotWxId());
-            vo.setAltId(agreeAddUserDTO.getRobotWxId());
-            vo.setWxGroupId(agreeAddUserDTO.getUserWxId());
-            vo.setIp(agreeAddUserDTO.getIp());
-            vo.setRobotProcessType(RobotProcessTypeEnum.WELCOME);
-            vo.setCounts(1);
-            vo.setIndex(0);
-            vo.setMessageGroupId(UUID.randomUUID().toString());
-            wechatGroupConsr.sendMessage(JSON.toJSONString(vo));
-            return;
-        }
-        if (StringUtil.isBlank(cipher)) {
-            cipher = wechatGroupConsr.getCipherByRobotAndUserWxId(agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId());
-        }
-        if (StringUtil.isBlank(cipher)) {
-            log.info("[同意加好友发送欢迎语] 暗号为空 agreeAddUserDTO：{}", agreeAddUserDTO);
-            return;
-        }
-        final JoinGroupCipherDTO dto = joinGroupCipherDao.getDTOByCipher(cipher);
-        //获取群
-        GroupQrcodeBaseInfoVO wxGroup = bookGroupClassifyBiz.getWxGroupIdByClassifyIdAndWechatId(dto.getClassifyId(), dto.getWechatUserId());
-        //判断是否是品牌方进具体群，如果是，从暗号表获取已经定好的群
-        if ((!StringUtil.isEmpty(agreeAddUserDTO.getCipher())) && agreeAddUserDTO.getCipher().contains("RAYS_")) {
-            JoinGroupCipher jgc = joinGroupCipherDao.getByCipher(agreeAddUserDTO.getCipher());
-            if (CipherTypeEnum.QRCODE_CIPHER.code.equals(jgc.getType())) {
-                wxGroup = groupQrcodeDao.getBaseById(jgc.getQrcodeId());
+            if (StringUtil.isBlank(cipher)) {
+                cipher = wechatGroupConsr.getCipherByRobotAndUserWxId(agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId());
             }
-        }
-        if (null == wxGroup) {
-            log.error("[同意加好友发送欢迎语] : bookGroupClassifyBiz.getWxGroupIdByClassifyIdAndWechatId dto:{}");
-            throw new BookBizException(BookBizException.ID_NOT_EXIST, "群不存在");
-        }
-        String wxGroupId = wxGroup.getWeixinGroupId();
-        if (agreeAddUserDTO.getFirst() != null && agreeAddUserDTO.getFirst()) {
-            // 如果是第一次就只发欢迎文案
-            SendTextMessageVO vo = new SendTextMessageVO();
+            if (StringUtil.isBlank(cipher)) {
+                log.info("[同意加好友发送欢迎语] 暗号为空 agreeAddUserDTO：{}", agreeAddUserDTO);
+                return;
+            }
+            final JoinGroupCipherDTO dto = joinGroupCipherDao.getDTOByCipher(cipher);
+            //获取群
+            GroupQrcodeBaseInfoVO wxGroup = bookGroupClassifyBiz.getWxGroupIdByClassifyIdAndWechatId(dto.getClassifyId(), dto.getWechatUserId());
+            //判断是否是品牌方进具体群，如果是，从暗号表获取已经定好的群
+            if ((!StringUtil.isEmpty(agreeAddUserDTO.getCipher())) && agreeAddUserDTO.getCipher().contains("RAYS_")) {
+                JoinGroupCipher jgc = joinGroupCipherDao.getByCipher(agreeAddUserDTO.getCipher());
+                if (CipherTypeEnum.QRCODE_CIPHER.code.equals(jgc.getType())) {
+                    wxGroup = groupQrcodeDao.getBaseById(jgc.getQrcodeId());
+                }
+            }
+            if (null == wxGroup) {
+                log.error("[同意加好友发送欢迎语] : bookGroupClassifyBiz.getWxGroupIdByClassifyIdAndWechatId dto:{}");
+                throw new BookBizException(BookBizException.ID_NOT_EXIST, "群不存在");
+            }
+            String wxGroupId = wxGroup.getWeixinGroupId();
+            if (agreeAddUserDTO.getFirst() != null && agreeAddUserDTO.getFirst()) {
+                // 如果是第一次就只发欢迎文案
+                SendTextMessageVO vo = new SendTextMessageVO();
 //            vo.setContent("你好，我是本书智能小助手，请回复你的进群暗号，获取本书资源服务，以及入群链接如果忘了进群暗号，请重新扫描书上的二维码，点击入群即可获取");
-            vo.setContent("你好，我是本书智能小助手。请输入关键词获取本书相应的资源服务。");
-            vo.setCode(SendMessageTypeEnum.SELF.getCode());
-            vo.setWxId(agreeAddUserDTO.getRobotWxId());
-            vo.setAltId(agreeAddUserDTO.getRobotWxId());
-            vo.setWxGroupId(agreeAddUserDTO.getUserWxId());
-            vo.setIp(agreeAddUserDTO.getIp());
-            log.info("[同意加好友发送欢迎语] : {}", vo);
-            vo.setRobotProcessType(RobotProcessTypeEnum.WELCOME);
-            vo.setCounts(1);
-            vo.setIndex(0);
-            vo.setMessageGroupId(UUID.randomUUID().toString());
-            wechatGroupConsr.sendMessage(JSON.toJSONString(vo));
-        }
-        // 如果不是第一次就发关键词
-        // 根据暗号获取分类id和bookGroupId推送关键词欢迎语
-        List<KeywordDTO> keywords = bookKeywordBiz.listFiveKeyword(dto.getClassifyId(), dto.getBookGroupId());
-        //发主打资源
-        sendMainKeyword(keywords,agreeAddUserDTO,dto,wxGroupId);
-        //发关键词列表
-        sendWeixinRequestTools.sendKeywordsInfoToSelf(keywords, agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
-        // 拉群
+                vo.setContent("你好，我是本书智能小助手。请输入关键词获取本书相应的资源服务。");
+                vo.setCode(SendMessageTypeEnum.SELF.getCode());
+                vo.setWxId(agreeAddUserDTO.getRobotWxId());
+                vo.setAltId(agreeAddUserDTO.getRobotWxId());
+                vo.setWxGroupId(agreeAddUserDTO.getUserWxId());
+                vo.setIp(agreeAddUserDTO.getIp());
+                log.info("[同意加好友发送欢迎语] : {}", vo);
+                vo.setRobotProcessType(RobotProcessTypeEnum.WELCOME);
+                vo.setCounts(1);
+                vo.setIndex(0);
+                vo.setMessageGroupId(UUID.randomUUID().toString());
+                wechatGroupConsr.sendMessage(JSON.toJSONString(vo));
+            }
+            // 如果不是第一次就发关键词
+            // 根据暗号获取分类id和bookGroupId推送关键词欢迎语
+            List<KeywordDTO> keywords = bookKeywordBiz.listFiveKeyword(dto.getClassifyId(), dto.getBookGroupId());
+            //发主打资源
+            sendMainKeyword(keywords, agreeAddUserDTO, dto, wxGroupId);
+            //发关键词列表
+            sendWeixinRequestTools.sendKeywordsInfoToSelf(keywords, agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
+            // 拉群
 //        final Integer peopleCounts = wxGroup.getUserNumber();
-        // 邀请好友进群有次数限制，目前测试为每天只能拉30-40人就操作频繁，所以在此加判断，超过30人或者群人数超过30人就发送邀请链接
-        final String num = JedisClusterUtils.get(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId());
-        log.info("[同意加好友发送欢迎语] 拉群 agreeAddUserDTO:{}, wxGroup:{}, num:{}", agreeAddUserDTO, wxGroup, num);
-        if (StringUtil.isBlank(wxGroupId)) {
-            log.info("[同意加好友发送欢迎语] 拉群 没有找到群 bookGroupClassifyBiz.getGroupQrcode4ClassifyWechat JoinGroupCipherDTO :{}", dto);
-            return;
-        }
-        // 1001666 刘娜需求-1v1客服机器人，不直接拉人，30人以下也发邀请链接
-        // 生产环境限制30，其它5和10，全部使用群链接
+            // 邀请好友进群有次数限制，目前测试为每天只能拉30-40人就操作频繁，所以在此加判断，超过30人或者群人数超过30人就发送邀请链接
+            final String num = JedisClusterUtils.get(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId());
+            log.info("[同意加好友发送欢迎语] 拉群 agreeAddUserDTO:{}, wxGroup:{}, num:{}", agreeAddUserDTO, wxGroup, num);
+            if (StringUtil.isBlank(wxGroupId)) {
+                log.info("[同意加好友发送欢迎语] 拉群 没有找到群 bookGroupClassifyBiz.getGroupQrcode4ClassifyWechat JoinGroupCipherDTO :{}", dto);
+                return;
+            }
+            // 1001666 刘娜需求-1v1客服机器人，不直接拉人，30人以下也发邀请链接
+            // 生产环境限制30，其它5和10，全部使用群链接
 //        final boolean isPro = "pro".equalsIgnoreCase(BookProps.getSystemEnv());
 //        if ((!StringUtil.isBlank(num) && Integer.parseInt(num) >= (isPro ? 30 : 5)) || peopleCounts >= (isPro ? 30 : 10)) {
             SendGroupInviteVO sendGroupInviteVO = new SendGroupInviteVO();
@@ -273,13 +281,34 @@ public class BookGuideBizImpl implements BookGuideBiz {
 //        vo1.setIp(agreeAddUserDTO.getIp());
 //        log.info("[同意加好友发送欢迎语 拉群] AddToGroupVO ：{}", vo1);
 //        WxGroupSDK.addToGroup(vo1);
-        // 进群之后更新群qrCodeId
-        updateQrcodeForCipher(wxGroupId, cipher, agreeAddUserDTO.getUserWxId());
-        // 拉一次+1
-        if (StringUtil.isBlank(num)) {
-            JedisClusterUtils.getSet(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId(), "1", 3600 * 24);
-        } else {
-            JedisClusterUtils.incr(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId());
+            // 进群之后更新群qrCodeId
+            updateQrcodeForCipher(wxGroupId, cipher, agreeAddUserDTO.getUserWxId());
+            // 拉一次+1
+            if (StringUtil.isBlank(num)) {
+                JedisClusterUtils.getSet(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId(), "1", 3600 * 24);
+            } else {
+                JedisClusterUtils.incr(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId());
+            }
+        }else{
+            //qq同意加好友 并发送欢迎语
+            PcloudRobot pcloudRobot = pcloudRobotDao.getByWxId(agreeAddUserDTO.getRobotWxId());
+            if (pcloudRobot!=null){
+                //删除需求单记录
+                //TODO
+                List<PcloudRobotWelcome> robotWelcomeListByPcloudClassifyId = pcloudRobotWelcomeDao.getRobotWelcomeListByPcloudClassifyId(Long.valueOf(pcloudRobot.getRobotType()), agreeAddUserDTO.getRobotType());
+                pcloudRobotBiz.sendQQWelcomeReply(agreeAddUserDTO.getReceiverId(),agreeAddUserDTO.getUserId(),robotWelcomeListByPcloudClassifyId);
+                //TODO 阶段处理
+                /*if (personalStageBiz.isPersonalStageUser(agreeAddUserDTO.getRobotWxId())){
+                    Long personalStageId = personalStageBiz.createAddUserStageUser(agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
+                    //清空缓存中该阶段的非关键词数量
+                    //刪除发送非关键词次数緩存
+                    JedisClusterUtils.del(PersonalStageConstant.USER_SEND_KEYWORD_COUNT_LOCK + personalStageId + "_" + agreeAddUserDTO.getUserWxId());
+                    //删除进度单点击记录缓存
+                    JedisClusterUtils.del("BOOK:LINK_PROGRESS:"+ agreeAddUserDTO.getUserWxId() + "-" +agreeAddUserDTO.getRobotWxId());
+                }*/
+                return;
+            }
+
         }
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/PcloudRobotBiz.java

@@ -109,4 +109,6 @@ public interface PcloudRobotBiz {
     List<String> getPcloudRobotByRobotType(Integer classifyId,Integer groupRobotType);
 
     void handleMiniAppQr();
+
+    void sendQQWelcomeReply(Long receiverId, Long userId, List<PcloudRobotWelcome> robotWelcomeListByPcloudClassifyId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/PcloudRobotClassifyBiz.java

@@ -35,7 +35,7 @@ public interface PcloudRobotClassifyBiz {
      */
     PageBeanNew<PcloudRobotClassifyResponseVO> listClassifyByPage(Integer currentPage, Integer numPerPage);
 
-    ClassifyWelcomeDTO getClassifyWelcome(Long classifyId);
+    ClassifyWelcomeDTO getClassifyWelcome(Long classifyId,Integer robotType);
 
     void updateClassifyWelcome(ClassifyWelcomeDTO classifyWelcomeDTO);
 

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/impl/PcloudRobotBizImpl.java

 package com.pcloud.book.pcloudkeyword.biz.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.dcg.coolq.sdk.message.MessageBuilder;
+import com.dcg.coolq.sdk.message.components.ComponentImage;
+import com.dcg.coolq.sdk.message.components.ComponentRecord;
+import com.dcg.coolq.sdk.message.components.ComponentText;
+import com.dcg.coolq.sdk.message.vos.send.PrivateMsgSendVO;
 import com.pcloud.appcenter.app.dto.AppDto;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.book.dao.BookDao;
@@ -44,6 +49,7 @@ import com.pcloud.book.pcloudkeyword.set.PcloudRobotSet;
 import com.pcloud.book.push.biz.SelfPushBiz;
 import com.pcloud.book.push.dao.PersonalAppletsDao;
 import com.pcloud.book.push.entity.PersonalApplets;
+import com.pcloud.book.push.enums.ItemTypeEnum;
 import com.pcloud.book.skill.biz.PcloudSkillBiz;
 import com.pcloud.book.skill.entity.PcloudSkill;
 import com.pcloud.book.util.common.ThreadPoolUtils;
@@ -302,14 +308,16 @@ public class PcloudRobotBizImpl implements PcloudRobotBiz {
             map.put("robotWxId", robotWxId);
             PcloudRobot pcloudRobot = (PcloudRobot)pcloudRobotDao.getBy(map, "getByRobotWxId");
             PcloudRobotClassify robotClassify=new PcloudRobotClassify();
+            Integer isOpenH5=0;
             if(pcloudRobot != null) {
                 if (pcloudRobot.getRobotType() != null) {
                     Integer welcomeDuration = 3;
                     robotClassify = pcloudRobotClassifyBiz.getClassifyById(pcloudRobot.getRobotType().longValue());
-                    if (robotClassify != null && robotClassify.getWelcomeDuration() != null) {
-                        welcomeDuration = robotClassify.getWelcomeDuration();
+                    List<PcloudRobotWelcome> robotWelcomeList = pcloudRobotWelcomeDao.getRobotWelcomeListByPcloudClassifyId(pcloudRobot.getRobotType().longValue(),1);
+                    if(robotWelcomeList!=null&&robotWelcomeList.size()>0){
+                        welcomeDuration=robotWelcomeList.get(0).getWelcomeDuration();
+                        isOpenH5=robotWelcomeList.get(0).getIsOpenPushH5url();
                     }
-                    List<PcloudRobotWelcome> robotWelcomeList = pcloudRobotWelcomeDao.getRobotWelcomeListByPcloudClassifyId(pcloudRobot.getRobotType().longValue());
                     pcloudRobotSet.fillRobotWelcome(robotWelcomeList);
                     Integer count= robotWelcomeList.size();
                     String messageGroup =  UUID.randomUUID().toString();
@@ -414,7 +422,7 @@ public class PcloudRobotBizImpl implements PcloudRobotBiz {
                         index ++;
                     }
                 }
-                if (robotClassify != null && robotClassify.getIsOpenPushH5url() != null && robotClassify.getIsOpenPushH5url() == 1) {
+                if (isOpenH5== 1) {
                     //发送H5链接
                     String endUrl = wechatLinkPrefix + "/dialog" + "?book_group_id=" + 0 + "&wxId=" + userWxId + "&robotWxId=" + robotWxId;
                     String resultUrl = UrlUtils.getShortUrl4Own(endUrl);
@@ -916,4 +924,48 @@ wechatGroupConsr.sendMessage(JSON.toJSONString(sendFileVO));
             });
         }
     }
+
+    @Override
+    public void sendQQWelcomeReply(Long receiverId, Long userId, List<PcloudRobotWelcome> robotWelcomeListByPcloudClassifyId) {
+        if (StringUtil.isEmpty(userId.toString()) || StringUtil.isEmpty(receiverId.toString())){
+            return;
+        }
+        if(getUserTdState(receiverId.toString(), userId.toString()) == 1) {
+            return;
+        }
+        for (PcloudRobotWelcome pcloudRobotWelcome:robotWelcomeListByPcloudClassifyId) {
+            PrivateMsgSendVO privateMsgSendVO = new PrivateMsgSendVO();
+            privateMsgSendVO.setSenderQQCode(Long.valueOf(receiverId));
+            privateMsgSendVO.setReceiverQQCode(Long.valueOf(userId));
+            if (WelcomeReplyTypeEnum.TEXT.value.equals(pcloudRobotWelcome.getReplyType())) {
+                // 构造一个文本消息
+                String message = new MessageBuilder().add(new ComponentText(pcloudRobotWelcome.getContent())).toString();// 文本消息
+                privateMsgSendVO.setMessage(message);
+                wechatGroupConsr.sendMessage4QQ(privateMsgSendVO);
+                return;
+            }
+            if (WelcomeReplyTypeEnum.IMAGE.value.equals(pcloudRobotWelcome.getReplyType())) {
+                // 构造一个图片消息
+                String message = new MessageBuilder().add(new ComponentImage(pcloudRobotWelcome.getPicUrl())) .toString(); // 图片消息
+                privateMsgSendVO.setMessage(message);
+                wechatGroupConsr.sendMessage4QQ(privateMsgSendVO);
+                return;
+            }
+            if (WelcomeReplyTypeEnum.AUDIO.value.equals(pcloudRobotWelcome.getReplyType())) {
+                // 构造一个图片消息
+                String message = new MessageBuilder().add(new ComponentRecord(pcloudRobotWelcome.getResourceUrl(),false)).toString(); // 音频消息
+                privateMsgSendVO.setMessage(message);
+                wechatGroupConsr.sendMessage4QQ(privateMsgSendVO);
+                return;
+            }
+            if (WelcomeReplyTypeEnum.RESOURCE.value.equals(pcloudRobotWelcome.getReplyType())) {
+                // 构造一个图片消息
+                String message = new MessageBuilder().add(new ComponentRecord(pcloudRobotWelcome.getResourceId().toString(),false)).toString(); // 资源文件消息
+                privateMsgSendVO.setMessage(message);
+                wechatGroupConsr.sendMessage4QQ(privateMsgSendVO);
+                return;
+            }
+        }
+
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/impl/PcloudRobotClassifyBizImpl.java

@@ -124,12 +124,13 @@ public class PcloudRobotClassifyBizImpl implements PcloudRobotClassifyBiz {
     }
 
     @Override
-    public ClassifyWelcomeDTO getClassifyWelcome(Long classifyId) {
+    public ClassifyWelcomeDTO getClassifyWelcome(Long classifyId,Integer robotType) {
         ClassifyWelcomeDTO classifyWelcomeDTO = new ClassifyWelcomeDTO();
-        PcloudRobotClassify robotClassify = pcloudRobotClassifyDao.getById(classifyId);
-        classifyWelcomeDTO.setIsOpenPushH5url(robotClassify.getIsOpenPushH5url());
-        classifyWelcomeDTO.setWelcomeDuration(robotClassify.getWelcomeDuration());
-        List<PcloudRobotWelcome> pcloudRobotWelcomeList = pcloudRobotWelcomeDao.getRobotWelcomeListByPcloudClassifyId(classifyId);
+        List<PcloudRobotWelcome> pcloudRobotWelcomeList = pcloudRobotWelcomeDao.getRobotWelcomeListByPcloudClassifyId(classifyId,robotType);
+        if(pcloudRobotWelcomeList!=null&&pcloudRobotWelcomeList.size()>0){
+            classifyWelcomeDTO.setIsOpenPushH5url(pcloudRobotWelcomeList.get(0).getIsOpenPushH5url());
+            classifyWelcomeDTO.setWelcomeDuration(pcloudRobotWelcomeList.get(0).getWelcomeDuration());
+        }
         pcloudRobotSet.fillRobotWelcome(pcloudRobotWelcomeList);
         classifyWelcomeDTO.setPcloudRobotWelcomeList(pcloudRobotWelcomeList);
         return classifyWelcomeDTO;
@@ -137,12 +138,15 @@ public class PcloudRobotClassifyBizImpl implements PcloudRobotClassifyBiz {
 
     @Override
     public void updateClassifyWelcome(ClassifyWelcomeDTO classifyWelcomeDTO) {
-        pcloudRobotClassifyDao.updateWelcomeDuration(classifyWelcomeDTO.getPcloudClassifyId(), classifyWelcomeDTO.getWelcomeDuration(),classifyWelcomeDTO.getIsOpenPushH5url());
+       // pcloudRobotClassifyDao.updateWelcomeDuration(classifyWelcomeDTO.getPcloudClassifyId(), classifyWelcomeDTO.getWelcomeDuration(),classifyWelcomeDTO.getIsOpenPushH5url());
         List<PcloudRobotWelcome> robotWelcomeList = classifyWelcomeDTO.getPcloudRobotWelcomeList();
-        pcloudRobotWelcomeDao.deleteByPcloudClassifyId(classifyWelcomeDTO.getPcloudClassifyId());
+        pcloudRobotWelcomeDao.deleteByPcloudClassifyId(classifyWelcomeDTO.getPcloudClassifyId(),classifyWelcomeDTO.getRobotType());
         if (ListUtils.isEmpty(robotWelcomeList)) {
             return;
         }
+        for (PcloudRobotWelcome robotWelcome:robotWelcomeList) {
+            robotWelcome.setRobotType(classifyWelcomeDTO.getRobotType());
+        }
         pcloudRobotWelcomeDao.batchInsert(robotWelcomeList);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/dao/PcloudRobotWelcomeDao.java

@@ -13,7 +13,7 @@ public interface PcloudRobotWelcomeDao extends BaseDao<PcloudRobotWelcome> {
 
     void batchInsert(List<PcloudRobotWelcome> robotWelcomeList);
 
-    List<PcloudRobotWelcome> getRobotWelcomeListByPcloudClassifyId(Long pcloudClassifyId);
+    List<PcloudRobotWelcome> getRobotWelcomeListByPcloudClassifyId(Long pcloudClassifyId,Integer robotType);
 
-    void deleteByPcloudClassifyId(Long pcloudClassifyId);
+    void deleteByPcloudClassifyId(Long pcloudClassifyId,Integer robotType);
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/dao/impl/PcloudRobotWelcomeDaoImpl.java

@@ -5,7 +5,9 @@ import com.pcloud.book.pcloudkeyword.entity.PcloudRobotWelcome;
 import com.pcloud.common.core.dao.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Component("pcloudRobotWelcomeDao")
 public class PcloudRobotWelcomeDaoImpl extends BaseDaoImpl<PcloudRobotWelcome> implements PcloudRobotWelcomeDao {
@@ -26,13 +28,19 @@ public class PcloudRobotWelcomeDaoImpl extends BaseDaoImpl<PcloudRobotWelcome> i
     }
 
     @Override
-    public List<PcloudRobotWelcome> getRobotWelcomeListByPcloudClassifyId(Long pcloudClassifyId) {
-        return super.getSqlSession().selectList(getStatement("getRobotWelcomeListByPcloudClassifyId"), pcloudClassifyId);
+    public List<PcloudRobotWelcome> getRobotWelcomeListByPcloudClassifyId(Long pcloudClassifyId,Integer robotType) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("pcloudClassifyId",pcloudClassifyId);
+        map.put("robotType",robotType);
+        return super.getSqlSession().selectList(getStatement("getRobotWelcomeListByPcloudClassifyId"), map);
     }
 
     @Override
-    public void deleteByPcloudClassifyId(Long pcloudClassifyId) {
-        super.getSqlSession().delete(getStatement("deleteByPcloudClassifyId"), pcloudClassifyId);
+    public void deleteByPcloudClassifyId(Long pcloudClassifyId,Integer robotType) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("pcloudClassifyId",pcloudClassifyId);
+        map.put("robotType",robotType);
+        super.getSqlSession().delete(getStatement("deleteByPcloudClassifyId"), map);
     }
 
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/dto/ClassifyWelcomeDTO.java

@@ -21,4 +21,7 @@ public class ClassifyWelcomeDTO extends BaseDTO {
 
     private List<PcloudRobotWelcome> pcloudRobotWelcomeList;
 
+    @ApiModelProperty("机器人分类 1微信机器人 2qq机器人")
+    private Integer robotType;
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/entity/PcloudRobotWelcome.java

@@ -70,6 +70,14 @@ public class PcloudRobotWelcome extends BaseEntity {
     @ApiModelProperty("小程序宣传图片")
     private String sloganImgUrl;
 
+    @ApiModelProperty("机器人分类 1微信机器人 2qq机器人")
+    private Integer robotType;
+
+    @ApiModelProperty("欢迎语间隔时长")
+    private Integer welcomeDuration;
+    @ApiModelProperty("是否开启h5页面链接推送")
+    private Integer isOpenPushH5url;
+
 
 
 

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/facade/PcloudRobotClassifyFacade.java

@@ -64,9 +64,9 @@ public class PcloudRobotClassifyFacade {
     @GetMapping("getClassifyWelcome")
     public ResponseDto<?> getClassifyWelcome(
             @RequestHeader("token") @ApiParam("token信息") String token,
-            @RequestParam("classifyId") @ApiParam("分类ID")  Long classifyId)  throws BizException, PermissionException {
+            @RequestParam("classifyId") @ApiParam("分类ID")  Long classifyId,@RequestParam("robotType") @ApiParam("分类ID")  Integer robotType)  throws BizException, PermissionException {
         SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
-        return new ResponseDto<>(pcloudRobotClassifyBiz.getClassifyWelcome(classifyId));
+        return new ResponseDto<>(pcloudRobotClassifyBiz.getClassifyWelcome(classifyId,robotType));
     }
 
     @PostMapping("updateClassifyWelcome")

pcloud-service-book/src/main/resources/mapper/pcloudkeyword/PcloudRobotWelcome.Mapper.xml

@@ -15,11 +15,14 @@
       <result column="resource_id" property="resourceId" jdbcType="INTEGER"/>
       <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
       <result column="personal_applets_id" property="personalAppletsId" jdbcType="BIGINT"/>
+      <result column="robot_type" property="robotType" jdbcType="INTEGER"/>
+      <result column="welcome_duration" property="welcomeDuration" jdbcType="INTEGER"/>
+      <result column="is_open_push_h5url" property="isOpenPushH5url" jdbcType="INTEGER"/>
 
   </resultMap>
   <sql id="Base_Column_List" >
     id, pcloud_robot_id, pcloud_classify_id, reply_type, content, pic_url, file_name, file_type, file_url,
-    file_size, resource_id, create_time,personal_applets_id
+    file_size, resource_id, create_time,personal_applets_id,robot_type,welcome_duration,is_open_push_h5url
   </sql>
 
     <!--批量插入-->
@@ -36,7 +39,10 @@
         file_size,
         resource_id,
         create_time,
-        personal_applets_id
+        personal_applets_id,
+        robot_type,
+        welcome_duration,
+        is_open_push_h5url
         ) values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -51,7 +57,10 @@
             #{item.fileSize,jdbcType=BIGINT},
             #{item.resourceId,jdbcType=BIGINT},
             NOW(),
-            #{item.personalAppletsId,jdbcType=BIGINT}
+            #{item.personalAppletsId,jdbcType=BIGINT},
+            #{item.robotType,jdbcType=INTEGER},
+            #{item.welcomeDuration,jdbcType=INTEGER},
+            #{item.isOpenPushH5url,jdbcType=INTEGER}
             )
         </foreach>
     </insert>
@@ -61,9 +70,9 @@
         where pcloud_robot_id = #{pcloudRobotId}
     </delete>
 
-    <delete id="deleteByPcloudClassifyId" parameterType="long">
+    <delete id="deleteByPcloudClassifyId" parameterType="map">
         delete from pcloud_robot_welcome
-        where pcloud_classify_id = #{pcloudClassifyId}
+        where pcloud_classify_id = #{pcloudClassifyId} and robot_type=#{robotType}
     </delete>
 
     <select id="getRobotWelcomeListByPcloudRobotId" parameterType="long" resultMap="BaseResultMap">
@@ -72,9 +81,9 @@
         where pcloud_robot_id = #{pcloudRobotId}
     </select>
 
-    <select id="getRobotWelcomeListByPcloudClassifyId" parameterType="long" resultMap="BaseResultMap">
+    <select id="getRobotWelcomeListByPcloudClassifyId" parameterType="map" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"/>
         from pcloud_robot_welcome
-        where pcloud_classify_id = #{pcloudClassifyId}
+        where pcloud_classify_id = #{pcloudClassifyId} and robot_type=#{robotType}
     </select>
 </mapper>
\ No newline at end of file