fix compile

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

@@ -23,6 +23,7 @@ import com.pcloud.book.group.dao.LearningReportBrowseRecordDao;
 import com.pcloud.book.group.dao.LearningReportTouchRecordDao;
 import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.book.group.dto.BookGroupStatisticDTO;
+import com.pcloud.book.group.dto.BookWxQrcodeDTO;
 import com.pcloud.book.group.dto.ClassifyDTO;
 import com.pcloud.book.group.dto.ClassifyLearningCountDto;
 import com.pcloud.book.group.dto.ClassifyLearningReportDto;
@@ -98,6 +99,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
@@ -252,7 +254,10 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
             bookKeywords.add(bookKeyword);
         });
         bookKeywordDao.insert(bookKeywords);
-        SendWeixinRequestTools.changeGroupName(oneQrcode.getRobotWxId(), oneQrcode.getWeixinGroupId(), groupQrcode.getGroupName());
+        final String wechatGroupId = oneQrcode.getWeixinGroupId();
+        Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
+        String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
+        SendWeixinRequestTools.changeGroupName(oneQrcode.getRobotWxId(), oneQrcode.getWeixinGroupId(), groupQrcode.getGroupName(), ip);
     }
 
     @ParamLog("新增商品对应规格")

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

@@ -9,10 +9,24 @@ import com.pcloud.book.consumer.label.LabelConsr;
 import com.pcloud.book.consumer.reader.ReaderConsr;
 import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
-import com.pcloud.book.group.biz.*;
+import com.pcloud.book.group.biz.BookGroupBiz;
+import com.pcloud.book.group.biz.BookGroupClassifyBiz;
+import com.pcloud.book.group.biz.GroupAnnouncementBiz;
+import com.pcloud.book.group.biz.GroupQrcodeBiz;
+import com.pcloud.book.group.biz.WeixinQrcodeBiz;
 import com.pcloud.book.group.constants.BookBusinessConstants;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
-import com.pcloud.book.group.dto.*;
+import com.pcloud.book.group.dto.AutoUpdateGroupNumDTO;
+import com.pcloud.book.group.dto.BookWxQrcodeDTO;
+import com.pcloud.book.group.dto.ChangeGroupNameDTO;
+import com.pcloud.book.group.dto.GroupAndUserNumberDTO;
+import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
+import com.pcloud.book.group.dto.GroupQrcodeDTO;
+import com.pcloud.book.group.dto.GroupQrcodeInfo4Advertising;
+import com.pcloud.book.group.dto.GroupQrcodeInfoDTO;
+import com.pcloud.book.group.dto.PushAddUserMessageDTO;
+import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
+import com.pcloud.book.group.dto.WeixinQrcodeDTO;
 import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.enums.QrcodeStatusEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
@@ -28,6 +42,7 @@ import com.pcloud.book.keywords.dto.KeywordUserCountDTO;
 import com.pcloud.book.mq.producer.BookMQProducer;
 import com.pcloud.book.push.dao.PushGroupDao;
 import com.pcloud.book.push.entity.PushGroup;
+import com.pcloud.book.riddle.dto.GroupRiddleDTO;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.page.PageBeanNew;
@@ -37,7 +52,7 @@ import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import com.sdk.wxgroup.WxGroupSDK;
-import com.pcloud.book.riddle.dto.GroupRiddleDTO;
+
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,7 +63,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -279,8 +293,11 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
         groupQrcodeDao.modifyNameById(wechatGroupName, id, updateUser);
         if (changeGroupNameDTO != null) {
             //获取修改群名称小号
-            String robotId = wechatGroupConsr.getRobotIdByGroupId(changeGroupNameDTO.getWxGroupId());
-            SendWeixinRequestTools.changeGroupName(robotId, changeGroupNameDTO.getWxGroupId(), wechatGroupName);
+            final String wechatGroupId = changeGroupNameDTO.getWxGroupId();
+            String robotId = wechatGroupConsr.getRobotIdByGroupId(wechatGroupId);
+            Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
+            String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
+            SendWeixinRequestTools.changeGroupName(robotId, changeGroupNameDTO.getWxGroupId(), wechatGroupName, ip);
         }
     }
 
@@ -526,7 +543,10 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
                         }
                     });
                     //String robotId = wechatGroupConsr.getRobotIdByGroupId(oneQrcode.getWeixinGroupId());
-                    SendWeixinRequestTools.changeGroupName(oneQrcode.getRobotWxId(), oneQrcode.getWeixinGroupId(), groupName);
+                    final String wechatGroupId = oneQrcode.getWeixinGroupId();
+                    Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
+                    String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
+                    SendWeixinRequestTools.changeGroupName(oneQrcode.getRobotWxId(), wechatGroupId, groupName, ip);
                 }
             }
         }

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

@@ -30,7 +30,6 @@ import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
 import com.sdk.wxgroup.AddToGroupVO;
-import com.sdk.wxgroup.GroupInfoVO;
 import com.sdk.wxgroup.QrcodeVO;
 import com.sdk.wxgroup.WxGroupSDK;
 
@@ -49,8 +48,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -220,7 +217,10 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
         }
         for (ChangeGroupNameDTO changeGroupNameDTO : changeGroupNameDTOS) {
             String robotId = wechatGroupConsr.getRobotIdByGroupId(changeGroupNameDTO.getWxGroupId());
-            SendWeixinRequestTools.changeGroupName(robotId, changeGroupNameDTO.getWxGroupId(), changeGroupNameDTO.getWxGroupName());
+            final String wechatGroupId = changeGroupNameDTO.getWxGroupId();
+            Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
+            String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
+            SendWeixinRequestTools.changeGroupName(robotId, changeGroupNameDTO.getWxGroupId(), changeGroupNameDTO.getWxGroupName(), ip);
         }
     }