yuanliang 1 год назад
Родитель
Сommit
60d2ca7711

+ 27 - 15
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -27,7 +27,15 @@ import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
 import com.yonge.cooleshow.biz.dal.enums.ImGroupType;
 import com.yonge.cooleshow.biz.dal.enums.RoleEnum;
-import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
+import com.yonge.cooleshow.biz.dal.service.CustomerServiceBatchSendingService;
+import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
+import com.yonge.cooleshow.biz.dal.service.ImGroupService;
+import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
+import com.yonge.cooleshow.biz.dal.service.StudentStarService;
+import com.yonge.cooleshow.biz.dal.service.SysConfigService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupWrapper;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.ThreadPool;
@@ -51,7 +59,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.text.ParseException;
@@ -813,17 +820,19 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
      */
     @Override
     public void groupTransfer() {
-        int page = 1;
-        int size = 100;
-        List<ImGroup> imGroups = this.lambdaQuery().orderByDesc(ImGroup::getCreateTime)
-                .last("limit " + ((page - 1) * size) + "," + size).list();
-        while (!imGroups.isEmpty()) {
-            groupTransfer(imGroups);
-
-            page++;
-            imGroups = this.lambdaQuery().orderByDesc(ImGroup::getCreateTime)
-                    .last("limit " + ((page - 1) * size) + "," + size).list();
-        }
+//        int page = 1;
+//        int size = 100;
+//        List<ImGroup> imGroups = this.lambdaQuery().orderByDesc(ImGroup::getCreateTime)
+//                .last("limit " + ((page - 1) * size) + "," + size).list();
+//        while (!imGroups.isEmpty()) {
+//            groupTransfer(imGroups);
+//
+//            page++;
+//            imGroups = this.lambdaQuery().orderByDesc(ImGroup::getCreateTime)
+//                    .last("limit " + ((page - 1) * size) + "," + size).list();
+//        }
+        ImGroup byId = this.getById("9f677fcd-9d80-4db0-8beb-0ff04e6a98f6FAN");
+        groupTransfer(Collections.singletonList(byId));
     }
 
     private void groupTransfer(List<ImGroup> records) {
@@ -881,8 +890,11 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
                             data.setUnreadMsgNum(0);
                             return data;
                         }).collect(Collectors.toList());
-                importGroupMember.setMemberList(members);
-                imPluginContext.getPluginService().importGroupMember(importGroupMember);
+                List<List<MessageWrapper.ImportGroupMemberData>> partition = Lists.partition(members, 6);
+                for (List<MessageWrapper.ImportGroupMemberData> importGroupMemberData : partition) {
+                    importGroupMember.setMemberList(importGroupMemberData);
+                    imPluginContext.getPluginService().importGroupMember(importGroupMember);
+                }
             } catch (Exception e) {
                 log.error(String.format("群迁移加入群聊失败:%s", e.getMessage()));
             }