Merge branch 'master' of http://192.168.89.173/rays/pcloud-book

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

@@ -313,6 +313,7 @@ public class AdNewsBizImpl implements AdNewsBiz {
         sendTextMessageVO.setContent(content);
         sendTextMessageVO.setAltId(robotId);
         sendTextMessageVO.setGroupId(weixinGroupId);
+        sendTextMessageVO.setIp(findIp(weixinGroupId));
         WxGroupSDK.sendTextMessage(sendTextMessageVO);
         LOGGER.info("发送编辑端早晚报" + sendTextMessageVO.toString());
     }
@@ -335,4 +336,11 @@ public class AdNewsBizImpl implements AdNewsBiz {
             adNewsGroup.setUpdateUser(partyId);
         }
     }
+
+    @ParamLog("获取ip")
+    private String findIp(String wechatGroupId) {
+        Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
+        String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
+        return ip;
+    }
 }

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

@@ -24,11 +24,13 @@ import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.book.consumer.user.AgentConsr;
 import com.pcloud.book.consumer.user.ChannelConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
+import com.pcloud.book.group.biz.WeixinQrcodeBiz;
 import com.pcloud.book.group.dao.BookGroupClassifyDao;
 import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
 import com.pcloud.book.group.dto.AdGroupQrcodeDTO;
 import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.BookWxQrcodeDTO;
 import com.pcloud.book.group.dto.ClassifyDTO;
 import com.pcloud.book.group.dto.GroupQrcodeInfoDTO;
 import com.pcloud.book.group.entity.BookGroup;
@@ -165,6 +167,8 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
     @Autowired
     private AdvertisingBrowseRecordDao advertisingBrowseRecordDao;
     @Autowired
+    private WeixinQrcodeBiz weixinQrcodeBiz;
+    @Autowired
     private AdvertisingDistributionBookDao distributionBookDao;
 
 
@@ -695,6 +699,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                 sendTextMessageVO.setGroupId(groupId);
                 sendTextMessageVO.setAltId(altId);
                 sendTextMessageVO.setContent(adTitle);
+                sendTextMessageVO.setIp(findIp(groupId));
                 LOGGER.info("发送微信消息-文字链接" + sendTextMessageVO.toString());
                 WxGroupSDK.sendTextMessage(sendTextMessageVO);
             } else if (AdPositionModeEnum.NEWS_SHARE.modeCode.equals(advertisingSpace.getAdPositionMode())) {
@@ -718,6 +723,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                 }
                 sendArticleMessageVO.setLinkUrl(adLink);
                 sendArticleMessageVO.setPicUrl(advertisingSpace.getAdPic());
+                sendArticleMessageVO.setIp(findIp(groupId));
                 LOGGER.info("发送微信消息-图文分享" + sendArticleMessageVO.toString());
                 WxGroupSDK.sendArticleMessage(sendArticleMessageVO);
             } else if (AdPositionModeEnum.JUST_PIC.modeCode.equals(advertisingSpace.getAdPositionMode())) {
@@ -725,6 +731,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                 sendPicMessageVO.setAltId(altId);
                 sendPicMessageVO.setGroupId(groupId);
                 sendPicMessageVO.setPicUrl(advertisingSpace.getAdPic());
+                sendPicMessageVO.setIp(findIp(groupId));
                 LOGGER.info("发送微信消息-纯图片" + sendPicMessageVO.toString());
                 WxGroupSDK.sendPicMessage(sendPicMessageVO);
             }
@@ -2982,4 +2989,11 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
         advertisingExposureRecordDao.updateExposureByQrcode(qrcodeId, peopleCounts);
     }
 
+    @ParamLog("获取ip")
+    private String findIp(String wechatGroupId) {
+        Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
+        String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
+        return ip;
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/GroupAnnouncementBizImpl.java

@@ -3,9 +3,11 @@ package com.pcloud.book.group.biz.impl;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
 import com.pcloud.book.group.biz.GroupAnnouncementBiz;
+import com.pcloud.book.group.biz.WeixinQrcodeBiz;
 import com.pcloud.book.group.dao.GroupAnnouncementDao;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
 import com.pcloud.book.group.dao.WeixinQrcodeDao;
+import com.pcloud.book.group.dto.BookWxQrcodeDTO;
 import com.pcloud.book.group.entity.GroupAnnouncement;
 import com.pcloud.book.group.entity.WeixinQrcode;
 import com.pcloud.common.core.aspect.ParamLog;
@@ -20,8 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Description
@@ -41,6 +42,8 @@ public class GroupAnnouncementBizImpl implements GroupAnnouncementBiz {
     private WechatGroupConsr wechatGroupConsr;
     @Autowired
     private WeixinQrcodeDao weixinQrcodeDao;
+    @Autowired
+    private WeixinQrcodeBiz weixinQrcodeBiz;
 
     @ParamLog("新增群公告")
     @Transactional(rollbackFor = Exception.class)
@@ -188,6 +191,7 @@ public class GroupAnnouncementBizImpl implements GroupAnnouncementBiz {
                     continue;
                 }
                 modifyNoticeVO.setMasterId(masterId);
+                modifyNoticeVO.setIp(findIp(wechatGroupId));
                 //设置群公告
                 LOGGER.info("设置群公告开始"+modifyNoticeVO.toString());
                 WxGroupSDK.modifyNotice(modifyNoticeVO);
@@ -196,4 +200,11 @@ public class GroupAnnouncementBizImpl implements GroupAnnouncementBiz {
         }
     }
 
+    @ParamLog("获取ip")
+    private String findIp(String wechatGroupId) {
+        Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
+        String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
+        return ip;
+    }
+
 }