fix 统一字段

pcloud-service-book/src/main/java/com/pcloud/book/BookApplication.java

@@ -199,9 +199,12 @@ public class BookApplication {
         return RabbitMQFactory.bindingExchange(wxGroupLearningReportQueue(), MQTopicProducer.WXGROUP_LEARNING_REPORT);
     }
 
+    /**
+     * 微信个人机器人同意加好友
+     */
     @Bean
     public Queue wxGroupAgreeAddUserQueue() {
-        return RabbitMQFactory.queueBuilder(MQTopicConumer.WXGROUP_AGREE_ADD_USER);
+        return RabbitMQFactory.queueBuilder(MQTopicConumer.WX_AGREE_ADD_USER);
     }
 
     @Bean

pcloud-service-book/src/main/java/com/pcloud/book/adnews/biz/impl/AdNewsBizImpl.java

@@ -312,7 +312,7 @@ public class AdNewsBizImpl implements AdNewsBiz {
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setContent(content);
         sendTextMessageVO.setAltId(robotId);
-        sendTextMessageVO.setGroupId(weixinGroupId);
+        sendTextMessageVO.setWxGroupId(weixinGroupId);
         sendTextMessageVO.setIp(findIp(weixinGroupId));
         WxGroupSDK.sendTextMessage(sendTextMessageVO);
         LOGGER.info("发送编辑端早晚报" + sendTextMessageVO.toString());

pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/AdvertisingSpaceBizImpl.java

@@ -719,7 +719,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                     }
                 }
                 SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-                sendTextMessageVO.setGroupId(groupId);
+                sendTextMessageVO.setWxGroupId(groupId);
                 sendTextMessageVO.setAltId(altId);
                 sendTextMessageVO.setContent(adTitle);
                 sendTextMessageVO.setIp(findIp(groupId));
@@ -730,7 +730,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                 sendArticleMessageVO.setAltId(altId);
                 sendArticleMessageVO.setTitle(advertisingSpace.getAdTitle());
                 sendArticleMessageVO.setDescription(advertisingSpace.getAdSlogan());
-                sendArticleMessageVO.setGroupId(groupId);
+                sendArticleMessageVO.setWxGroupId(groupId);
                 String adLink = "";
                 if (!StringUtil.isEmpty(advertisingSpace.getAdLink())) {
                     if (advertisingSpace.getAdLink().contains("?")) {
@@ -752,7 +752,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
             } else if (AdPositionModeEnum.JUST_PIC.modeCode.equals(advertisingSpace.getAdPositionMode())) {
                 SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
                 sendPicMessageVO.setAltId(altId);
-                sendPicMessageVO.setGroupId(groupId);
+                sendPicMessageVO.setWxGroupId(groupId);
                 sendPicMessageVO.setPicUrl(advertisingSpace.getAdPic());
                 sendPicMessageVO.setIp(findIp(groupId));
                 LOGGER.info("发送微信消息-纯图片" + sendPicMessageVO.toString());

pcloud-service-book/src/main/java/com/pcloud/book/clock/biz/impl/BookClockBizImpl.java

@@ -377,7 +377,7 @@ public class BookClockBizImpl implements BookClockBiz {
                             //获取机器人微信号
                             String altId = wechatGroupConsr.getRobotIdByGroupId(weixinGroupId);
                             SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-                            sendTextMessageVO.setGroupId(weixinGroupId);
+                            sendTextMessageVO.setWxGroupId(weixinGroupId);
                             sendTextMessageVO.setAltId(altId);
                             sendTextMessageVO.setContent(bookClockInfoDTO.getNoticeContent());
                             if(!MapUtils.isEmpty(wxQrcodeDTOMap) && wxQrcodeDTOMap.containsKey(weixinGroupId)){

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

@@ -161,13 +161,13 @@ public class SendWeixinRequestTools {
             SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
             sendTextMessageVO.setContent(sendMessageDTO.getContent());
             sendTextMessageVO.setAltId(robotId);
-            sendTextMessageVO.setGroupId(weixinGroupId);
+            sendTextMessageVO.setWxGroupId(weixinGroupId);
             sendTextMessageVO.setIp(ip);
             sendTextMessageVO.setCode(code);
             WxGroupSDK.sendTextMessage(sendTextMessageVO);
         } else if (ReplyTypeEnum.IMAGE.value.equals(sendMessageDTO.getReplyType())) {
             SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
-            sendPicMessageVO.setGroupId(weixinGroupId);
+            sendPicMessageVO.setWxGroupId(weixinGroupId);
             sendPicMessageVO.setAltId(robotId);
             sendPicMessageVO.setPicUrl(sendMessageDTO.getPicUrl());
             sendPicMessageVO.setIp(ip);
@@ -178,7 +178,7 @@ public class SendWeixinRequestTools {
             sendArticleMessageVO.setAltId(robotId);
             sendArticleMessageVO.setDescription(sendMessageDTO.getDescription());
             sendArticleMessageVO.setLinkUrl(sendMessageDTO.getLinkUrl());
-            sendArticleMessageVO.setGroupId(weixinGroupId);
+            sendArticleMessageVO.setWxGroupId(weixinGroupId);
             sendArticleMessageVO.setPicUrl(sendMessageDTO.getPicUrl());
             sendArticleMessageVO.setTitle(sendMessageDTO.getContent());
             sendArticleMessageVO.setIp(ip);
@@ -192,7 +192,7 @@ public class SendWeixinRequestTools {
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setContent(nickNameStr);
         sendTextMessageVO.setAltId(robotId);
-        sendTextMessageVO.setGroupId(weixinGroupId);
+        sendTextMessageVO.setWxGroupId(weixinGroupId);
         sendTextMessageVO.setIp(ip);
         WxGroupSDK.sendTextMessage(sendTextMessageVO);
 
@@ -220,11 +220,11 @@ public class SendWeixinRequestTools {
         }
         sendTextMessageVO.setContent(recommendLanguage);
         sendTextMessageVO.setAltId(robotId);
-        sendTextMessageVO.setGroupId(weixinGroupId);
+        sendTextMessageVO.setWxGroupId(weixinGroupId);
         sendTextMessageVO.setIp(ip);
         WxGroupSDK.sendTextMessage(sendTextMessageVO);
         SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
-        sendPicMessageVO.setGroupId(weixinGroupId);
+        sendPicMessageVO.setWxGroupId(weixinGroupId);
         sendPicMessageVO.setAltId(robotId);
         sendPicMessageVO.setPicUrl(accountSettingDto.getQrcodeUrl());
         sendPicMessageVO.setIp(ip);
@@ -299,7 +299,7 @@ public class SendWeixinRequestTools {
     private static void sendTextMessageToSelf(String content, String robotId, String toWxId, String ip){
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
-        sendTextMessageVO.setGroupId(toWxId);
+        sendTextMessageVO.setWxGroupId(toWxId);
         sendTextMessageVO.setContent(content);
         sendTextMessageVO.setAltId(robotId);
         sendTextMessageVO.setIp(ip);
@@ -310,7 +310,7 @@ public class SendWeixinRequestTools {
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setContent(content);
         sendTextMessageVO.setAltId(robotId);
-        sendTextMessageVO.setGroupId(weixinGroupId);
+        sendTextMessageVO.setWxGroupId(weixinGroupId);
         sendTextMessageVO.setIp(ip);
         WxGroupSDK.sendTextMessage(sendTextMessageVO);
     }
@@ -319,7 +319,7 @@ public class SendWeixinRequestTools {
 //        SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
 //        sendTextMessageVO.setContent("关键词1：a" + "\n" + "换行换行换行" + "\n");
 //        sendTextMessageVO.setAltId("wxid_qj200bf0key022");
-//        sendTextMessageVO.setGroupId("14108963419@chatroom");
+//        sendTextMessageVO.setWxGroupId("14108963419@chatroom");
 //        WxGroupSDK.sendTextMessage(sendTextMessageVO);
     }
 
@@ -365,7 +365,7 @@ public class SendWeixinRequestTools {
     public static void sendClockKeywordsInfo(List<BookClockKeywordDTO> keywords, String robotId, String weixinGroupId, String ip) {
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setAltId(robotId);
-        sendTextMessageVO.setGroupId(weixinGroupId);
+        sendTextMessageVO.setWxGroupId(weixinGroupId);
         sendTextMessageVO.setIp(ip);
         if (ListUtils.isEmpty(keywords)) {
             return;

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

@@ -116,7 +116,7 @@ public class BookGuideBizImpl implements BookGuideBiz {
         vo.setContent("你好，我是本书智能小助手，请回复你的进群暗号，获取本书资源服务，以及入群链接如果忘了进群暗号，请重新扫描书上的二维码，点击入群即可获取");
         vo.setCode(SendMessageTypeEnum.SELF.getCode());
         vo.setWxId(agreeAddUserDTO.getRobotWxId());
-        vo.setGroupId(agreeAddUserDTO.getUserWxId());
+        vo.setWxGroupId(agreeAddUserDTO.getUserWxId());
         log.info("[同意加好友发送欢迎语] : {}", vo);
         WxGroupSDK.sendTextMessage(vo);
         // 根据暗号获取分类id和bookGroupId推送关键词欢迎语

pcloud-service-book/src/main/java/com/pcloud/book/keywords/facade/impl/BookGuideFacadeImpl.java

@@ -6,12 +6,15 @@ import com.pcloud.book.keywords.vo.GuideVO;
 import com.pcloud.book.keywords.vo.ReplyMessageVO;
 import com.pcloud.book.keywords.vo.SetGuideVO;
 import com.pcloud.book.keywords.vo.UpdateGuideVO;
+import com.pcloud.common.core.constant.MQTopicProducer;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.SessionUtil;
+import com.pcloud.wechatgroup.message.dto.AgreeAddUserDTO;
 
+import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,16 +29,34 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Map;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * @author lily
  * @date 2019/4/23 15:24
  */
+@Slf4j
 @RestController("bookGuideFacade")
 @RequestMapping("bookGuide")
 public class BookGuideFacadeImpl implements BookGuideFacade {
 
     @Autowired
     private BookGuideBiz bookGuidBiz;
+    @Autowired
+    private AmqpTemplate amqpTemplate;
+
+    @PostMapping("test")
+    public void test() {
+        final AgreeAddUserDTO agreeAddUserDTO = new AgreeAddUserDTO();
+        agreeAddUserDTO.setNickName("大威");
+        agreeAddUserDTO.setRobotWxId("wxid_arjobo1bbk2i22");
+        // 当消息为个人消息时，wechatGroupId为发送人id
+        agreeAddUserDTO.setUserWxId("p867263500");
+        agreeAddUserDTO.setIp("http://192.168.92.122:8081");
+        log.info("[processSelfMessage] start convertAndSend agreeAddUserDTO:{}", agreeAddUserDTO);
+        // 发送topic book处理后续欢迎语，关键词和拉群操作
+        amqpTemplate.convertAndSend(MQTopicProducer.EXCHAGE, MQTopicProducer.WX_AGREE_ADD_USER, agreeAddUserDTO);
+    }
 
     @Override
     @PostMapping("insertGuide")

pcloud-service-book/src/main/java/com/pcloud/book/mq/config/MQTopicConumer.java

@@ -73,6 +73,6 @@ public class MQTopicConumer {
     /**
      * 微信群同意添加好友成功
      */
-    public static final String WXGROUP_AGREE_ADD_USER = PREFIX + MQTopicProducer.WX_AGREE_ADD_USER;
+    public static final String WX_AGREE_ADD_USER = PREFIX + MQTopicProducer.WX_AGREE_ADD_USER;
 
 }

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

@@ -67,7 +67,7 @@ public class UpdateWXGroupNameListener {
                 SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
                 sendTextMessageVO.setContent("@"+groupNameDTO.getNickName()+"，为方便群友入群分享好的助学方法，请不要随意修改群名。如再修改，会将您移出群聊。谢谢配合。");
                 sendTextMessageVO.setAltId(altId);
-                sendTextMessageVO.setGroupId(wechatGroupId);
+                sendTextMessageVO.setWxGroupId(wechatGroupId);
                 LOGGER.info("发送警告文本消息"+sendTextMessageVO.toString());
                 sendTextMessageVO.setIp(findIp(wechatGroupId));
                 WxGroupSDK.sendTextMessage(sendTextMessageVO);

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

@@ -25,6 +25,7 @@ import com.pcloud.wechatgroup.message.dto.GroupLearningReportDTO;
 import com.sdk.wxgroup.SendPicMessageVO;
 import com.sdk.wxgroup.SendTextMessageVO;
 import com.sdk.wxgroup.WxGroupSDK;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
@@ -63,8 +64,9 @@ public class WXGroupLearningReportListener {
         try {
             if (groupLearningReportDTO == null
                     || groupLearningReportDTO.getWechatGroupId() == null
-                    || groupLearningReportDTO.getWechatUserId() == null)
+                    || groupLearningReportDTO.getWechatUserId() == null) {
                 return;
+            }
             String wechatUserId = groupLearningReportDTO.getWechatUserId();
             String wechatGroupId = groupLearningReportDTO.getWechatGroupId();
             //新增触发记录
@@ -102,7 +104,7 @@ public class WXGroupLearningReportListener {
                 return;
             }
             SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-            sendTextMessageVO.setGroupId(wechatGroupId);
+            sendTextMessageVO.setWxGroupId(wechatGroupId);
             sendTextMessageVO.setAltId(alt);
             sendTextMessageVO.setContent("个人专属学习报告，及群成员元气排行榜。点击获取" + resultUrl);
             sendTextMessageVO.setIp(findIp(wechatGroupId));
@@ -115,7 +117,7 @@ public class WXGroupLearningReportListener {
             }
             SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
             sendPicMessageVO.setPicUrl(imageUrl);
-            sendPicMessageVO.setGroupId(wechatGroupId);
+            sendPicMessageVO.setWxGroupId(wechatGroupId);
             sendPicMessageVO.setAltId(alt);
             sendPicMessageVO.setIp(findIp(wechatGroupId));
             LOGGER.info("发送分享图消息开始"+sendTextMessageVO.toString());

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

 package com.pcloud.book.mq.topic;
 
 import com.pcloud.book.keywords.biz.BookGuideBiz;
-import com.pcloud.book.keywords.biz.BookKeywordBiz;
 import com.pcloud.book.mq.config.MQTopicConumer;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.wechatgroup.message.dto.AgreeAddUserDTO;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -24,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Slf4j
 @Component
-@RabbitListener(queues = MQTopicConumer.WXGROUP_AGREE_ADD_USER)
 public class WxAgreeAddUserListener {
 
     @Resource
@@ -34,7 +29,7 @@ public class WxAgreeAddUserListener {
      * 接收微信用户进群消息
      */
     @ParamLog("同意加好友发送欢迎语")
-    @RabbitHandler
+    @RabbitListener(queues = MQTopicConumer.WX_AGREE_ADD_USER)
     public void onMessage(AgreeAddUserDTO agreeAddUserDTO) throws BizException {
         try {
             bookGuideBiz.sendGuide(agreeAddUserDTO);

pcloud-service-book/src/main/java/com/pcloud/book/push/biz/impl/PushBizImpl.java

@@ -320,7 +320,7 @@ public class PushBizImpl implements PushBiz {
             Integer itemType = pushItem.getItemType();
             if (ItemTypeEnum.TEXT.value.equals(itemType)) {
                 SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-                sendTextMessageVO.setGroupId(groupId);
+                sendTextMessageVO.setWxGroupId(groupId);
                 sendTextMessageVO.setAltId(altId);
                 sendTextMessageVO.setContent(pushItem.getTextContent());
                 sendTextMessageVO.setPushGroupRecordId(pushGroupRecordId);
@@ -331,7 +331,7 @@ public class PushBizImpl implements PushBiz {
                 SendArticleMessageVO sendArticleMessageVO = new SendArticleMessageVO();
                 sendArticleMessageVO.setAltId(altId);
                 sendArticleMessageVO.setDescription(pushItem.getLinkDescription());
-                sendArticleMessageVO.setGroupId(groupId);
+                sendArticleMessageVO.setWxGroupId(groupId);
                 String url = pushItem.getLinkUrl();
                 if (url.contains("?")) {
                     url = url + "&" + otherUrl;
@@ -359,7 +359,7 @@ public class PushBizImpl implements PushBiz {
                         SendArticleMessageVO sendArticleMessageVO = new SendArticleMessageVO();
                         sendArticleMessageVO.setAltId(altId);
                         sendArticleMessageVO.setDescription(appDto.getTypeName());
-                        sendArticleMessageVO.setGroupId(groupId);
+                        sendArticleMessageVO.setWxGroupId(groupId);
                         // 处理链接地址
                         String endUrl = pushItem.getAppUrl() + "&" + otherUrl;
                         String linkUrl = SendWeixinRequestTools.splitUrl(accountSettingDto, endUrl);
@@ -381,7 +381,7 @@ public class PushBizImpl implements PushBiz {
                         if (productDto.getProductTypeDto() != null) {
                             sendArticleMessageVO.setDescription(productDto.getProductTypeDto().getTypeName());
                         }
-                        sendArticleMessageVO.setGroupId(groupId);
+                        sendArticleMessageVO.setWxGroupId(groupId);
                         // 处理链接地址
                         String endUrl = pushItem.getProductUrl() + "&" + otherUrl;
                         String linkUrl = SendWeixinRequestTools.splitUrl(accountSettingDto, endUrl);
@@ -399,7 +399,7 @@ public class PushBizImpl implements PushBiz {
             if (ItemTypeEnum.IMAGE.value.equals(itemType)) {
                 SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
                 sendPicMessageVO.setAltId(altId);
-                sendPicMessageVO.setGroupId(groupId);
+                sendPicMessageVO.setWxGroupId(groupId);
                 sendPicMessageVO.setPicUrl(pushItem.getImageUrl());
                 sendPicMessageVO.setPushGroupRecordId(pushGroupRecordId);
                 sendPicMessageVO.setIp(findIp(groupId));
@@ -980,7 +980,7 @@ public class PushBizImpl implements PushBiz {
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setContent(content);
         sendTextMessageVO.setAltId(robotId);
-        sendTextMessageVO.setGroupId(weixinGroupId);
+        sendTextMessageVO.setWxGroupId(weixinGroupId);
         sendTextMessageVO.setIp(findIp(weixinGroupId));
         WxGroupSDK.sendTextMessage(sendTextMessageVO);
         LOGGER.info("发送早晚报" + sendTextMessageVO.toString());