修复VIP课堂

mec-biz/src/main/java/com/ym/mec/biz/service/ImGroupService.java

@@ -1,6 +1,6 @@
 package com.ym.mec.biz.service;
 
-import com.microsvc.toolkit.middleware.im.message.ImGroupMemberWrapper;
+import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ImGroupDto;
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
@@ -119,10 +119,10 @@ public interface ImGroupService extends BaseService<String, ImGroup> {
     void addSchoolStaffGroup(Long schoolId, Integer userId,String name,String avatar, ESchoolStaffType leader) throws Exception;
 
     @Transactional(rollbackFor = Exception.class)
-    void addSchoolGroup(Long schoolId, List<ImGroupMemberWrapper.ImGroupMember> imGroupMembers);
+    void addSchoolGroup(Long schoolId, List<GroupMemberWrapper.ImGroupMember> imGroupMembers);
 
     @Transactional(rollbackFor = Exception.class)
-    void quitSchoolGroup(Long schoolId, List<ImGroupMemberWrapper.ImGroupMember> imGroupMembers);
+    void quitSchoolGroup(Long schoolId, List<GroupMemberWrapper.ImGroupMember> imGroupMembers);
 
     /**
      * 群主移交
@@ -136,8 +136,8 @@ public interface ImGroupService extends BaseService<String, ImGroup> {
      * 加群
      *
      * @param musicGroupIds 群组ID
-     * @param user          用户信息
-     * @param userType
+     * @param userId          用户信息
+     * @param roleType
      */
     void addImGroup(List<String> musicGroupIds, Long  userId,  String roleType);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -2,7 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.microsvc.toolkit.middleware.im.message.ImGroupMemberWrapper;
+import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.ym.mec.auth.api.client.SysUserFeignService;
@@ -329,9 +329,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if (musicGroup != null && musicGroup.getCooperationOrganId() != null) {
 
-            List<ImGroupMemberWrapper.ImGroupMember > imGroupMemberList = new ArrayList<>();
+            List<GroupMemberWrapper.ImGroupMember > imGroupMemberList = new ArrayList<>();
             for (ClassGroupTeacherMapper classGroupTeacherMapper : teacherMapperList) {
-                ImGroupMemberWrapper.ImGroupMember build = ImGroupMemberWrapper.ImGroupMember.builder()
+                GroupMemberWrapper.ImGroupMember build = GroupMemberWrapper.ImGroupMember.builder()
                         .userId(classGroupTeacherMapper.getUserId().longValue())
                         .roleType(EFriendRoleType.ORCHESTRA_TEACHER.getMsg())
                         .build();
@@ -357,7 +357,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             List<MusicGroup> musicGroups = cooperationOrganService.musicGroupPage(musicGroup.getCooperationOrganId());
             List<String> ids = musicGroups.stream().map(o -> o.getId()).collect(Collectors.toList());
 
-            List<ImGroupMemberWrapper.ImGroupMember > imGroupMemberList = new ArrayList<>();
+            List<GroupMemberWrapper.ImGroupMember > imGroupMemberList = new ArrayList<>();
             for (ClassGroupTeacherMapper classGroupTeacherMapper : teacherMapperList) {
 
                 if (!CollectionUtils.isEmpty(ids)) {
@@ -367,7 +367,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     }
                 }
 
-                ImGroupMemberWrapper.ImGroupMember build = ImGroupMemberWrapper.ImGroupMember.builder()
+                GroupMemberWrapper.ImGroupMember build = GroupMemberWrapper.ImGroupMember.builder()
                         .userId(classGroupTeacherMapper.getUserId().longValue())
                         .roleType(EFriendRoleType.ORCHESTRA_TEACHER.getMsg())
                         .build();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.google.common.collect.Lists;
 import com.microsvc.toolkit.middleware.im.ImPluginContext;
 import com.microsvc.toolkit.middleware.im.ImPluginService;
-import com.microsvc.toolkit.middleware.im.message.ImGroupMemberWrapper;
+import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.ImGroupDto;
@@ -327,7 +327,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 }
             }
             try {
-                imPluginService.groupQuit(imGroupMember.getImGroupId(), ImGroupMemberWrapper.ImGroupMember.builder().userId(userId).imUserIdFormat(false).build());
+                imPluginService.groupQuit(imGroupMember.getImGroupId(), GroupMemberWrapper.ImGroupMember.builder().userId(userId).imUserIdFormat(false).build());
             } catch (Exception e) {
                 log.error("用户退出群失败{},{}", userId, imGroupMember.getImGroupId(), e);
             }
@@ -349,7 +349,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         List<ImGroup> groups = imGroups.stream().filter(imGroup -> imGroup.getMemberNum().equals(1)).collect(Collectors.toList());
         for (ImGroup group : groups) {
             try {
-                ImGroupMemberWrapper.ImGroupMember build = ImGroupMemberWrapper.ImGroupMember.builder().userId(userId).imUserIdFormat(false).build();
+                GroupMemberWrapper.ImGroupMember build = GroupMemberWrapper.ImGroupMember.builder().userId(userId).imUserIdFormat(false).build();
                 imPluginService.groupDismiss(group.getId(), Lists.newArrayList(build));
             } catch (Exception e) {
                 log.error("解散群组失败{},{}", userId, group.getId(), e);
@@ -401,7 +401,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
             initSchoolGroup(imGroup.getSchoolId());
         }
-        imPluginService.groupJoin(imGroup.getId(), imGroup.getName(), ImGroupMemberWrapper.ImGroupMember.builder()
+        imPluginService.groupJoin(imGroup.getId(), imGroup.getName(), GroupMemberWrapper.ImGroupMember.builder()
                 .userId(userId.longValue()).imUserIdFormat(false).build());
 
         if (schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
@@ -448,14 +448,14 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             teacherIds.addAll(teacherMapperList.stream().map( o -> o.getUserId()).collect(Collectors.toSet()));
         }
 
-        List<ImGroupMemberWrapper.ImGroupMember> imGroupMembers = new ArrayList<>();
+        List<GroupMemberWrapper.ImGroupMember> imGroupMembers = new ArrayList<>();
         for (Integer groupLeaderId : groupLeaderIds) {
-            imGroupMembers.add(ImGroupMemberWrapper.ImGroupMember.builder()
+            imGroupMembers.add(GroupMemberWrapper.ImGroupMember.builder()
                     .userId(groupLeaderId.longValue()).roleType(EFriendRoleType.ORCHESTRA_MANAGER.getMsg()).imUserIdFormat(false).build());
         }
 
         for (Integer teacherId : teacherIds) {
-            imGroupMembers.add(ImGroupMemberWrapper.ImGroupMember.builder()
+            imGroupMembers.add(GroupMemberWrapper.ImGroupMember.builder()
                     .userId(teacherId.longValue()).roleType(EFriendRoleType.ORCHESTRA_TEACHER.getMsg()).imUserIdFormat(false).build());
         }
 
@@ -470,7 +470,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void addSchoolGroup(Long schoolId, List<ImGroupMemberWrapper.ImGroupMember> imGroupMembers) {
+    public void addSchoolGroup(Long schoolId, List<GroupMemberWrapper.ImGroupMember> imGroupMembers) {
         // 添加乐团领队，班级老师
         List<ImGroupMember> imGroupMemberList =new ArrayList<>();
 
@@ -484,7 +484,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             return;
         }
 
-        for (ImGroupMemberWrapper.ImGroupMember groupMember : imGroupMembers) {
+        for (GroupMemberWrapper.ImGroupMember groupMember : imGroupMembers) {
             ImGroupMember imGroupMember = new ImGroupMember();
             imGroupMember.setImGroupId(imGroup.getId());
             imGroupMember.setUserId(groupMember.getUserId().intValue());
@@ -512,7 +512,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void quitSchoolGroup(Long schoolId, List<ImGroupMemberWrapper.ImGroupMember> imGroupMembers) {
+    public void quitSchoolGroup(Long schoolId, List<GroupMemberWrapper.ImGroupMember> imGroupMembers) {
         // 添加乐团领队，班级老师
 
 
@@ -531,7 +531,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
         List<Integer> userIds = new ArrayList<>();
         ImPluginService imPluginService =imPluginContext.getPluginService(serviceProvider);
-        for (ImGroupMemberWrapper.ImGroupMember imGroupMember : imGroupMembers) {
+        for (GroupMemberWrapper.ImGroupMember imGroupMember : imGroupMembers) {
             imGroupMember.setImUserIdFormat(false);
             userIds.add(imGroupMember.getUserId().intValue());
         }
@@ -583,7 +583,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
      * 加群
      *
      * @param imGroupIds    群组ID
-     * @param user          用户信息
+     * @param userId          用户信息
      * @param roleType      用户类型
      */
     @Override
@@ -609,7 +609,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 continue;
             }
             try {
-                imPluginService.groupJoin(imGroup.getId(), imGroup.getName(), ImGroupMemberWrapper.ImGroupMember.builder()
+                imPluginService.groupJoin(imGroup.getId(), imGroup.getName(), GroupMemberWrapper.ImGroupMember.builder()
                         .userId(userId)
                         .imUserIdFormat(false).build());
 
@@ -663,7 +663,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         List<com.ym.mec.biz.dal.entity.ImGroupMember> imGroupMemberList = new ArrayList<>();
         for (ImGroup imGroup : groupList) {
             try {
-                imPluginService.groupQuit(imGroup.getId(),  ImGroupMemberWrapper.ImGroupMember.builder().userId(userId.longValue()).imUserIdFormat(false).build());
+                imPluginService.groupQuit(imGroup.getId(),  GroupMemberWrapper.ImGroupMember.builder().userId(userId.longValue()).imUserIdFormat(false).build());
             } catch (Exception e) {
                 log.error("退出群聊失败",e);
             }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.beust.jcommander.internal.Lists;
-import com.microsvc.toolkit.middleware.im.message.ImGroupMemberWrapper;
+import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
@@ -1657,7 +1657,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //统计变更学员数
         groupEventSource.musicGroupStudentChangeEvent(musicGroupId, StudentMusicGroupStatusEnum.NORMAL, null);
 
-        ImGroupMemberWrapper.ImGroupMember build = ImGroupMemberWrapper.ImGroupMember.builder()
+        GroupMemberWrapper.ImGroupMember build = GroupMemberWrapper.ImGroupMember.builder()
                 .userId(musicGroup.getEducationalTeacherId().longValue())
                 .roleType(EFriendRoleType.ORCHESTRA_MANAGER.getMsg())
                 .build();