小小训练营群组改造，更改群编号数据类型

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ImGroupDao.java

@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface ImGroupDao extends BaseDAO<Long, ImGroup> {
+public interface ImGroupDao extends BaseDAO<String, ImGroup> {
 
-	ImGroup getLocked(Long imGroupId);
+	ImGroup getLocked(String imGroupId);
 
 	/**
 	 * 查询用户所在的群列表
@@ -25,9 +25,9 @@ public interface ImGroupDao extends BaseDAO<Long, ImGroup> {
 	 * @param imGroupId
 	 * @return
 	 */
-	List<ImGroupMemberDto> queryMemberById(Long imGroupId);
+	List<ImGroupMemberDto> queryMemberById(String imGroupId);
 
-	ImGroupMemberDto queryMember(@Param("imGroupId") Long imGroupId, @Param("userId") Integer userId);
+	ImGroupMemberDto queryMember(@Param("imGroupId") String imGroupId, @Param("userId") Integer userId);
 
     int updateNickname(@Param("userId") Integer userId, @Param("nickName") String nickName);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ImGroupMemberDao.java

@@ -11,7 +11,7 @@ import com.ym.mec.common.dal.BaseDAO;
 
 public interface ImGroupMemberDao extends BaseDAO<Long, ImGroupMember> {
 
-	int deleteByImGroupId(Long imGroupId);
+	int deleteByImGroupId(String imGroupId);
 
 	int batchDelete(List<ImGroupMember> imGroupMemberList);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ImGroupNoticeDao.java

@@ -14,9 +14,9 @@ public interface ImGroupNoticeDao extends BaseDAO<Long, ImGroupNotice> {
 	 * @param imGroupId
 	 * @return
 	 */
-	ImGroupNoticeDto queryLatestNotice(Long imGroupId);
+	ImGroupNoticeDto queryLatestNotice(String imGroupId);
 	
 	List<ImGroupNoticeDto> queryForPage(Map<String, Object> params);
 	
-	int deleteByImGroupId(Long imGroupId);
+	int deleteByImGroupId(String imGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupMember.java

@@ -13,7 +13,7 @@ public class ImGroupMember extends BaseEntity {
 	private Long id;
 	
 	/**  */
-	private Long imGroupId;
+	private String imGroupId;
 	
 	/**  */
 	private Integer userId;
@@ -70,11 +70,11 @@ public class ImGroupMember extends BaseEntity {
 		return this.id;
 	}
 			
-	public void setImGroupId(Long imGroupId){
+	public void setImGroupId(String imGroupId){
 		this.imGroupId = imGroupId;
 	}
 	
-	public Long getImGroupId(){
+	public String getImGroupId(){
 		return this.imGroupId;
 	}
 			

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupNotice.java

@@ -13,7 +13,7 @@ public class ImGroupNotice extends BaseEntity {
 	private Long id;
 	
 	/**  */
-	private Long imGroupId;
+	private String imGroupId;
 	
 	/** 标题 */
 	private String title;
@@ -47,11 +47,11 @@ public class ImGroupNotice extends BaseEntity {
 		return this.id;
 	}
 			
-	public void setImGroupId(Long imGroupId){
+	public void setImGroupId(String imGroupId){
 		this.imGroupId = imGroupId;
 	}
 	
-	public Long getImGroupId(){
+	public String getImGroupId(){
 		return this.imGroupId;
 	}
 			

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

@@ -18,7 +18,7 @@ public interface ImGroupMemberService extends BaseService<Long, ImGroupMember> {
 	 * @param isAdmin 是否是管理员
 	 * @return
 	 */
-	boolean join(Long imGroupId, Integer userId, String roleType, boolean isAdmin);
+	boolean join(String imGroupId, Integer userId, String roleType, boolean isAdmin);
 
 	/**
 	 * 加入群组
@@ -27,7 +27,7 @@ public interface ImGroupMemberService extends BaseService<Long, ImGroupMember> {
 	 * @param isAdmin 是否是管理员
 	 * @return
 	 */
-	boolean join(Long imGroupId, String roleType, boolean isAdmin, ImGroup imGroup, SysUser user);
+	boolean join(String imGroupId, String roleType, boolean isAdmin, ImGroup imGroup, SysUser user);
 
 	/**
 	 * 批量加入群组
@@ -35,7 +35,7 @@ public interface ImGroupMemberService extends BaseService<Long, ImGroupMember> {
 	 * @param userRoleMap key-用户编号  value-角色类型
 	 * @return
 	 */
-	boolean join(Long imGroupId, Map<Integer, String> userRoleMap);
+	boolean join(String imGroupId, Map<Integer, String> userRoleMap);
 
 	/**
 	 * 指定用户退出群组
@@ -43,7 +43,7 @@ public interface ImGroupMemberService extends BaseService<Long, ImGroupMember> {
 	 * @param userId 指定的用户编号
 	 * @return
 	 */
-	boolean quit(Long imGroupId, Integer userId);
+	boolean quit(String imGroupId, Integer userId);
 
 	/**
 	 * 退出指定群组
@@ -51,7 +51,7 @@ public interface ImGroupMemberService extends BaseService<Long, ImGroupMember> {
 	 * @param userId 用户编号
 	 * @return
 	 */
-	boolean quit(List<Long> imGroupIdList, Integer userId);
+	boolean quit(List<String> imGroupIdList, Integer userId);
 
 	/**
 	 * 用户批量退出群组
@@ -59,7 +59,7 @@ public interface ImGroupMemberService extends BaseService<Long, ImGroupMember> {
 	 * @param userIdList 学生编号
 	 * @return
 	 */
-	boolean quit(Long imGroupId, List<Integer> userIdList);
+	boolean quit(String imGroupId, List<Integer> userIdList);
 
 	/**
 	 * 修改角色类型
@@ -68,7 +68,7 @@ public interface ImGroupMemberService extends BaseService<Long, ImGroupMember> {
 	 * @param roleType 角色类型
 	 * @return
 	 */
-	boolean updateRoleType(Long imGroupId, Integer userId, String roleType);
+	boolean updateRoleType(String imGroupId, Integer userId, String roleType);
 
 	void batchInsert(List<ImGroupMember> imGroupMemberList);
 

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

@@ -15,5 +15,5 @@ public interface ImGroupNoticeService extends BaseService<Long, ImGroupNotice> {
 	 * @param imGroupId
 	 * @return
 	 */
-	ImGroupNoticeDto queryLatestNotice(Long imGroupId);
+	ImGroupNoticeDto queryLatestNotice(String imGroupId);
 }

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

@@ -6,7 +6,7 @@ import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
 
-public interface ImGroupService extends BaseService<Long, ImGroup> {
+public interface ImGroupService extends BaseService<String, ImGroup> {
 
 	/**
 	 * 创建群组
@@ -20,14 +20,17 @@ public interface ImGroupService extends BaseService<Long, ImGroup> {
 	 * @param type 群类型
 	 * @return
 	 */
-	ImGroup create(Long id, Integer userId, String name, String introduce, String memo, String tags, String img, String type);
+	ImGroup create(String id, Integer userId, String name, String introduce, String memo, String tags, String img, String type);
+
+	//创建非课程类型的业务群组
+	void createGroup(List<String> userIdList,String groupName,String groupType);
 
 	/**
 	 * 解散群组
 	 * @param imGroupId
 	 * @return
 	 */
-	boolean cancel(Long imGroupId);
+	boolean cancel(String imGroupId);
 
 	/**
 	 * 查询用户所在的群列表
@@ -42,7 +45,7 @@ public interface ImGroupService extends BaseService<Long, ImGroup> {
 	 * @param imGroupId
 	 * @return
 	 */
-	List<ImGroupMemberDto> queryMemberById(Long imGroupId);
+	List<ImGroupMemberDto> queryMemberById(String imGroupId);
 
 	/**
 	 * 查询指定用户在群众的信息
@@ -50,7 +53,7 @@ public interface ImGroupService extends BaseService<Long, ImGroup> {
 	 * @param userId 指定的用户编号
 	 * @return
 	 */
-	ImGroupMemberDto queryMember(Long imGroupId, Integer userId);
+	ImGroupMemberDto queryMember(String imGroupId, Integer userId);
 
 	/**
 	 * 修改用户在群、通讯录的备注

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

@@ -299,8 +299,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     userRoleMap.put(teacherId, "指导老师");
                 }
             }
-            imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), musicGroup.getName(), musicGroup.getName(), musicGroup.getName(), null, "MUSIC");
-            imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+            imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), musicGroup.getName(), musicGroup.getName(), musicGroup.getName(), null, "MUSIC");
+            imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
         }
         return true;
     }
@@ -1176,7 +1176,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
 
         //5、加入班级群组
-        imGroupMemberService.join(classGroup.getId().longValue(), userId, null, false);
+        imGroupMemberService.join(classGroup.getId().toString(), userId, null, false);
 
         return classGroup;
     }
@@ -1382,7 +1382,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
 
             // 5、加入班级群组
-            imGroupMemberService.join(classGroup.getId().longValue(), studentId, null, false);
+            imGroupMemberService.join(classGroup.getId().toString(), studentId, null, false);
 
         }
 
@@ -1443,7 +1443,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //删除班级
         classGroupDao.delete(classGroupId);
         //删除im群组
-        imGroupService.cancel(classGroupId.longValue());
+        imGroupService.cancel(classGroupId.toString());
     }
 
     @Override
@@ -1468,7 +1468,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //删除合奏班
         classGroupDao.delete(classGroupId);
         //删除im群组
-        imGroupService.cancel(classGroupId.longValue());
+        imGroupService.cancel(classGroupId.toString());
     }
 
     @Override
@@ -2394,17 +2394,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 if (byClassGroup != null && byClassGroup.size() > 0) {
                     ClassGroupTeacherMapper groupTeacherMapper = byClassGroup.stream().filter(classGroupTeacherMapper -> classGroupTeacherMapper.getTeacherRole() == TeachTypeEnum.BISHOP).findFirst().get();
                     if (groupTeacherMapper != null) {
-                        imGroupMemberService.quit(classGroupId.longValue(), groupTeacherMapper.getUserId());
+                        imGroupMemberService.quit(classGroupId.toString(), groupTeacherMapper.getUserId());
                     }
                 }
                 if (newTeacherMapperList.size() > 0) {
                     //获取之前的班级老师
                     Set<Integer> groupTeacher = classGroupDao.findGroupTeacher(classGroupId);
                     groupTeacher.forEach(e -> {
-                        imGroupMemberService.quit(classGroupId.longValue(), e);
+                        imGroupMemberService.quit(classGroupId.toString(), e);
                     });
                     newTeacherMapperList.forEach(e -> {
-                        imGroupMemberService.join(classGroupId.longValue(), e.getUserId(), "指导老师", false);
+                        imGroupMemberService.join(classGroupId.toString(), e.getUserId(), "指导老师", false);
                     });
                 }
             }
@@ -3427,7 +3427,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             throw new BizException("请填写班级名称");
         }
         classGroupDao.update(classGroup);
-        ImGroup imGroup = imGroupService.get(classGroup.getId().longValue());
+        ImGroup imGroup = imGroupService.get(classGroup.getId().toString());
         if(!Objects.isNull(imGroup)){
             imGroup.setName(groupName);
             imGroupService.update(imGroup);
@@ -3745,8 +3745,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
         }
 
-        imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), musicGroup.getName(), musicGroup.getName(), musicGroup.getName(), null, "MUSIC");
-        imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+        imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), musicGroup.getName(), musicGroup.getName(), musicGroup.getName(), null, "MUSIC");
+        imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
         imUserFriendService.refreshClassImUserFriend(classGroup.getId());
         return true;
     }
@@ -4238,7 +4238,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     for (Integer integer : integers) {
                         List<Integer> collect = Arrays.asList(classGroupStudent.get(integer).split(",")).stream().map(e -> Integer.parseInt(e)).collect(Collectors.toList());
                         //学员退出群聊
-                        imGroupMemberService.quit(integer.longValue(), collect);
+                        imGroupMemberService.quit(integer.toString(), collect);
                         classGroupStudentMapperDao.deleteByClassGroupIdAndStudents(integer, classGroupStudent.get(integer));
                     }
                 }
@@ -4744,7 +4744,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 for (Integer integer : integers) {
                     List<Integer> collect = Arrays.asList(classGroupStudent.get(integer).split(",")).stream().map(e -> Integer.parseInt(e)).collect(Collectors.toList());
                     //学员退出群聊
-                    imGroupMemberService.quit(integer.longValue(), collect);
+                    imGroupMemberService.quit(integer.toString(), collect);
                     classGroupIds.add(integer);
                     classGroupStudentMapperDao.deleteByClassGroupIdAndStudents(integer, classGroupStudent.get(integer));
                 }

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

@@ -233,7 +233,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 //        }
 
         //5、学生退出班级群组
-        imGroupMemberService.quit(classGroup.getId().longValue(), userId);
+        imGroupMemberService.quit(classGroup.getId().toString(), userId);
         return true;
     }
 
@@ -431,7 +431,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         }
 
         //5、添加进IM群组
-        imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+        imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
 
         return true;
     }
@@ -564,7 +564,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                         userRoleMap.put(addStudentId, "");
                     }
                     //5、添加进IM群组
-                    imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+                    imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
                 }
             }
             if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
@@ -586,7 +586,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
             courseScheduleDao.deleteMusicGroupCourseSchedulesWithStudents(courseIds, new ArrayList<>(removeStudentIds));
             if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
                 //5、学生退出班级群组
-                imGroupMemberService.quit(classGroup.getId().longValue(), new ArrayList<Integer>(addStudentIds));
+                imGroupMemberService.quit(classGroup.getId().toString(), new ArrayList<Integer>(addStudentIds));
             }
         }
 
@@ -599,7 +599,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                     userRoleMap.put(addStudentId, "");
                 }
                 //5、添加进IM群组
-                imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+                imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
             }
         }
 
@@ -718,7 +718,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         for (Integer studentId : studentIds) {
         	userRoleMap.put(studentId, null);
         }
-        imGroupMemberService.join(classGroupId.longValue(), userRoleMap);
+        imGroupMemberService.join(classGroupId.toString(), userRoleMap);
         imUserFriendService.refreshClassImUserFriend(classGroupId.intValue());
     }
 }

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

@@ -74,7 +74,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 userIdList.add(classGroupTeacherMapper.getUserId());
             }
             if (userIdList.size() > 0) {
-                imGroupMemberService.quit(classGroup.getId().longValue(), userIdList);
+                imGroupMemberService.quit(classGroup.getId().toString(), userIdList);
             }
             // 新设置的老师加入群组
             userIdList.clear();
@@ -89,7 +89,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
             	for(Integer userId : userIdList){
             		userRoleMap.put(userId, "指导老师");
             	}
-                imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+                imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
             }
         }
         classGroupTeacherMapperDao.delMusicGroupTeacherMapper(classGroupTeacherMapperList);
@@ -118,7 +118,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 oldTeacher.add(classGroupTeacherMapper.getClassGroupId() + classGroupTeacherMapper.getTeacherRole().getCode() + classGroupTeacherMapper.getUserId());
             }
             if (userIdList.size() > 0) {
-                imGroupMemberService.quit(classGroup.getId().longValue(), userIdList);
+                imGroupMemberService.quit(classGroup.getId().toString(), userIdList);
             }
             // 新设置的老师加入群组
             userIdList.clear();
@@ -134,7 +134,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
             	for(Integer userId : userIdList){
             		userRoleMap.put(userId, "指导老师");
             	}
-                imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+                imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
             }
         }
         classGroupTeacherMapperDao.delMusicGroupTeacherMapper(classGroupTeacherMapperList);

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

@@ -1,34 +1,19 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.ClassGroupDao;
-import com.ym.mec.biz.dal.dao.CooperationOrganDao;
-import com.ym.mec.biz.dal.dao.CooperationOrganLinkmanDao;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.CooperationOrgan;
-import com.ym.mec.biz.dal.entity.CooperationOrganLinkman;
-import com.ym.mec.biz.dal.entity.Employee;
-import com.ym.mec.biz.dal.entity.ImGroup;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.biz.service.ImGroupService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
 
 @Service
 public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, CooperationOrgan>  implements CooperationOrganService {
@@ -107,9 +92,9 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 					Integer educationalTeacherId = musicGroup.getEducationalTeacherId();
 					classGroups.forEach(e -> {
 						if(educationalTeacherId != null){
-							imGroupMemberService.quit(e.getId().longValue(), educationalTeacherId);
+							imGroupMemberService.quit(e.getId().toString(), educationalTeacherId);
 						}
-						imGroupMemberService.join(e.getId().longValue(),"乐团主管",false,null,sysUser);
+						imGroupMemberService.join(e.getId().toString(),"乐团主管",false,null,sysUser);
 					});
 				}
 			}
@@ -120,10 +105,10 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 					//不是导入的乐团
 					if(musicGroup.getId().length() > 10){
 						//是否有预报名的群聊
-						ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroup.getId()));
+						ImGroup imGroup = imGroupService.get(musicGroup.getId());
 						if(imGroup != null){
-							imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),musicGroup.getEducationalTeacherId());
-							imGroupMemberService.join(Long.parseLong(musicGroup.getId()),"乐团主管",false,imGroup,sysUser);
+							imGroupMemberService.quit(musicGroup.getId(),musicGroup.getEducationalTeacherId());
+							imGroupMemberService.join(musicGroup.getId(),"乐团主管",false,imGroup,sysUser);
 						}
 					}
 				}
@@ -168,9 +153,9 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 							userRoleMap.put(cooperationOrgan.getEducationUserId(), "乐团主管");
 							classGroups.forEach(e -> {
 								if(educationalTeacherId != null){
-									imGroupMemberService.quit(e.getId().longValue(), quitUserIdList);
+									imGroupMemberService.quit(e.getId().toString(), quitUserIdList);
 								}
-								imGroupMemberService.join(e.getId().longValue(), userRoleMap);
+								imGroupMemberService.join(e.getId().toString(), userRoleMap);
 							});
 						}
 					}
@@ -181,10 +166,10 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 							//不是导入的乐团
 							if(musicGroup.getId().length() > 10){
 								//是否有预报名的群聊
-								ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroup.getId()));
+								ImGroup imGroup = imGroupService.get(musicGroup.getId());
 								if(imGroup != null){
-									imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),musicGroup.getEducationalTeacherId());
-									imGroupMemberService.join(Long.parseLong(musicGroup.getId()),cooperationOrgan.getEducationUserId(),"乐团主管",false);
+									imGroupMemberService.quit(musicGroup.getId(),musicGroup.getEducationalTeacherId());
+									imGroupMemberService.join(musicGroup.getId(),cooperationOrgan.getEducationUserId(),"乐团主管",false);
 								}
 							}
 						}

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

@@ -5350,8 +5350,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			ImGroupMember[] oldImGroupMembers = {new ImGroupMember(oldTeacherId.toString())};
 			ImGroupMember[] imGroupMembers = {new ImGroupMember(newTeacherId.toString())};
 			for (ClassGroup classGroup:classGroupList) {
-				imGroupMemberService.quit(classGroup.getId().longValue(), oldTeacherId);
-				imGroupMemberService.join(classGroup.getId().longValue(), newTeacherId, "指导老师", false);
+				imGroupMemberService.quit(classGroup.getId().toString(), oldTeacherId);
+				imGroupMemberService.join(classGroup.getId().toString(), newTeacherId, "指导老师", false);
 			}
 		}
 	}

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

@@ -257,10 +257,10 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         courseScheduleTeacherSalaryDao.batchInsert(courseScheduleTeacherSalaries);
         teacherAttendanceDao.batchInsert(teacherAttendances);
         //创建群聊
-        imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), courseGroup.getName(), courseGroup.getName(), courseGroup.getName(), null, "COMM");
+        imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), courseGroup.getName(), courseGroup.getName(), courseGroup.getName(), null, "COMM");
         Map<Integer,String> userRoleMap = new HashMap(1);
         userRoleMap.put(courseGroup.getTeacherId(),"指导老师");
-        imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+        imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
         return BaseController.succeed();
     }
 
@@ -754,8 +754,8 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         userRoleMap.put(coursesGroup.getTeacherId(), "");
         userRoleMap.put(order.getUserId(), "");
         
-        imGroupService.create(classGroup.getId().longValue(), coursesGroup.getTeacherId(), classGroup.getName(), classGroup.getName(), classGroup.getName(), classGroup.getName(), null, "COMM");
-        imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+        imGroupService.create(classGroup.getId().toString(), coursesGroup.getTeacherId(), classGroup.getName(), classGroup.getName(), classGroup.getName(), classGroup.getName(), null, "COMM");
+        imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
         imUserFriendService.refreshClassImUserFriend(classGroup.getId());
         return BaseController.succeed();
     }

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

@@ -418,7 +418,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
                 String userId = imGroupModel.getMemberList().get(0).getId();
                 com.ym.mec.biz.dal.entity.ImGroupMember imGroupMember = new com.ym.mec.biz.dal.entity.ImGroupMember();
                 imGroupMember.setCreateTime(date);
-                imGroupMember.setImGroupId(Long.parseLong(imGroupModel.getId()));
+                imGroupMember.setImGroupId(imGroupModel.getId());
                 imGroupMember.setIsAdmin(false);
                 imGroupMember.setRoleType(imGroupModel.getUserRole());
                 imGroupMember.setUpdateTime(date);
@@ -441,7 +441,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
             List<GroupModel> groupModelList = new ArrayList<>();
             for (ImGroupModel imGroupModel : groupModels) {
                 com.ym.mec.biz.dal.entity.ImGroupMember imGroupMember = new com.ym.mec.biz.dal.entity.ImGroupMember();
-                imGroupMember.setImGroupId(Long.parseLong(imGroupModel.getId()));
+                imGroupMember.setImGroupId(imGroupModel.getId());
                 imGroupMember.setUserId(Integer.parseInt(imGroupModel.getMemberList().get(0).getId()));
                 imGroupMemberList.add(imGroupMember);
 

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

@@ -513,7 +513,7 @@ public class GroupClassServiceImpl implements GroupClassService {
                 classGroupDao.update(giveClassGroup);
 
                 //学员退出班级群
-                imGroupMemberService.quit(giveClassGroup.getId().longValue(), studentId);
+                imGroupMemberService.quit(giveClassGroup.getId().toString(), studentId);
             }
             if((masterGroup && activityUserMapper.getGivePracticeFlag() == 2) || (!masterGroup && activityUserMapper.getPracticeFlag() == 2)){
                 Long givePracticeGroupId = activityUserMapper.getGivePracticeGroupId();

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

@@ -4,10 +4,8 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.biz.service.ImGroupService;
-import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
@@ -48,21 +46,20 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 	private ClassGroupStudentMapperDao classGroupStudentMapperDao;
 	@Autowired
 	private ImFeignService imFeignService;
-	@Autowired
-	private SysMessageService sysMessageService;
 	@Override
 	public BaseDAO<Long, ImGroupMember> getDAO() {
 		return imGroupMemberDao;
 	}
 
-	public ImGroup joinGroup(Long imGroupId, Integer userId, String roleType, boolean isAdmin,Map<Integer,String> userRoleMap){
-		ClassGroup classGroup = classGroupDao.get(imGroupId.intValue());
+	public ImGroup joinGroup(String imGroupId, Integer userId, String roleType, boolean isAdmin,Map<Integer,String> userRoleMap){
+		int groupId = Integer.parseInt(imGroupId);
+		ClassGroup classGroup = classGroupDao.get(groupId);
 		String tags = classGroup.getName();
 		//相关用户加入群组
 		//获取班级关联的老师列表
-		Set<Integer> teacherIds = classGroupTeacherMapperDao.queryTeacherIdsByClassGroupId(imGroupId.intValue(),null,null);
+		Set<Integer> teacherIds = classGroupTeacherMapperDao.queryTeacherIdsByClassGroupId(groupId,null,null);
 		//获取班级关联的学员列表
-		Set<Integer> studentIds = classGroupStudentMapperDao.queryStudentIdsByClassGroupId(imGroupId.intValue(),null,null);
+		Set<Integer> studentIds = classGroupStudentMapperDao.queryStudentIdsByClassGroupId(groupId,null,null);
 		if(studentIds != null && studentIds.size() > 0){
 			for(Integer studentId : studentIds){
 				userRoleMap.put(studentId, null);
@@ -113,7 +110,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean join(Long imGroupId, Integer userId, String roleType, boolean isAdmin) {
+	public boolean join(String imGroupId, Integer userId, String roleType, boolean isAdmin) {
 		ImGroup imGroup = imGroupDao.getLocked(imGroupId);
 		if (imGroup == null) {
 			joinGroup(imGroupId,userId,roleType,isAdmin,new HashMap<>());
@@ -156,7 +153,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean join(Long imGroupId,String roleType, boolean isAdmin,ImGroup imGroup,SysUser user) {
+	public boolean join(String imGroupId,String roleType, boolean isAdmin,ImGroup imGroup,SysUser user) {
 		if (imGroup == null) {
 			imGroup = imGroupDao.getLocked(imGroupId);
 		}
@@ -201,7 +198,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean join(Long imGroupId, Map<Integer, String> userRoleMap) {
+	public boolean join(String imGroupId, Map<Integer, String> userRoleMap) {
 		ImGroup imGroup = imGroupDao.getLocked(imGroupId);
 		if (imGroup == null) {
 			joinGroup(imGroupId,null,null,false,userRoleMap);
@@ -271,7 +268,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean quit(Long imGroupId, Integer userId) {
+	public boolean quit(String imGroupId, Integer userId) {
 		List<Integer> userIdList = new ArrayList<Integer>();
 		userIdList.add(userId);
 
@@ -280,8 +277,8 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean quit(List<Long> imGroupIdList, Integer userId) {
-		for (Long imGroupId : imGroupIdList) {
+	public boolean quit(List<String> imGroupIdList, Integer userId) {
+		for (String imGroupId : imGroupIdList) {
 			quit(imGroupId, userId);
 		}
 		return true;
@@ -289,7 +286,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean quit(Long imGroupId, List<Integer> userIdList) {
+	public boolean quit(String imGroupId, List<Integer> userIdList) {
 
 		ImGroup imGroup = imGroupDao.getLocked(imGroupId);
 		if (imGroup == null) {
@@ -321,7 +318,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 	}
 
 	@Override
-	public boolean updateRoleType(Long imGroupId, Integer userId, String roleType) {
+	public boolean updateRoleType(String imGroupId, Integer userId, String roleType) {
 		List<Integer> userIdList = new ArrayList<Integer>();
 		userIdList.add(userId);
 		List<ImGroupMember> imGroupMemberList = imGroupMemberDao.queryByImGroupIdAndUserId(imGroupId.toString(), userIdList.stream().map(Objects::toString)

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

@@ -50,7 +50,7 @@ public class ImGroupNoticeServiceImpl extends BaseServiceImpl<Long, ImGroupNotic
 	}
 
 	@Override
-	public ImGroupNoticeDto queryLatestNotice(Long imGroupId) {
+	public ImGroupNoticeDto queryLatestNotice(String imGroupId) {
 		return imGroupNoticeDao.queryLatestNotice(imGroupId);
 	}
 	

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.biz.service.ImGroupService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImUserModel;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.im.entity.GroupMember;
@@ -19,12 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
-public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implements ImGroupService {
+public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> implements ImGroupService {
 
 	@Autowired
 	private ImGroupDao imGroupDao;
@@ -45,13 +44,13 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 	private SysUserFeignService sysUserFeignService;
 
 	@Override
-	public BaseDAO<Long, ImGroup> getDAO() {
+	public BaseDAO<String, ImGroup> getDAO() {
 		return imGroupDao;
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public ImGroup create(Long id, Integer userId, String name, String introduce, String memo, String tags, String img, String type) {
+	public ImGroup create(String id, Integer userId, String name, String introduce, String memo, String tags, String img, String type) {
 		ImGroup imGroup = imGroupDao.get(id);
 		if (imGroup != null) {
 			return imGroup;
@@ -61,7 +60,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 
 		Date date = new Date();
 
-		imGroup.setId(id.toString());
+		imGroup.setId(id);
 		imGroup.setCreateTime(date);
 		imGroup.setIntroduce(introduce);
 		
@@ -93,32 +92,38 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 		return imGroup;
 	}
 
-	public void create1(String groupId,List<String> userIdList,String groupName){
-		List<GroupMember> groupMembers = new ArrayList<>();
-		for (String userId : userIdList) {
-			GroupMember groupMember = new GroupMember();
-			groupMember.setGroupId(groupId);
-			groupMember.setId(userId);
-			groupMembers.add(groupMember);
-		}
-		GroupMember[] members = new GroupMember[groupMembers.size()];
-		groupMembers.toArray(members);
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void createGroup(List<String> userIdList,String groupName,String groupType){
+		Optional.of(userIdList).orElseThrow(() -> new BizException("群成员不能为空"));
+		Optional.of(groupName).orElseThrow(() -> new BizException("群名称不能为空"));
+		Optional.of(groupType).orElseThrow(() -> new BizException("群类型不能为空"));
 		Date date = new Date();
 		ImGroup imGroup = new ImGroup();
+		String groupId = UUID.randomUUID().toString();
 		imGroup.setId(groupId);
 		imGroup.setCreateTime(date);
 		imGroup.setIntroduce(groupName);
 		imGroup.setMemberNum(userIdList.size());
 		imGroup.setName(groupName);
-		imGroup.setType("TRAINING");
+		imGroup.setType(groupType);
 		imGroup.setUpdateTime(date);
 		imGroupDao.insert(imGroup);
+		List<GroupMember> groupMembers = new ArrayList<>();
+		for (String userId : userIdList) {
+			GroupMember groupMember = new GroupMember();
+			groupMember.setGroupId(groupId);
+			groupMember.setId(userId);
+			groupMembers.add(groupMember);
+		}
+		GroupMember[] members = new GroupMember[groupMembers.size()];
+		groupMembers.toArray(members);
 		imFeignService.groupCreate(new GroupModel(groupId,members,groupName));
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean cancel(Long imGroupId) {
+	public boolean cancel(String imGroupId) {
 
 		// 删除群成员
 		imGroupMemberDao.deleteByImGroupId(imGroupId);
@@ -139,12 +144,12 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
     }
 
     @Override
-	public List<ImGroupMemberDto> queryMemberById(Long imGroupId) {
+	public List<ImGroupMemberDto> queryMemberById(String imGroupId) {
 		return imGroupDao.queryMemberById(imGroupId);
 	}
 
 	@Override
-	public ImGroupMemberDto queryMember(Long imGroupId, Integer userId) {
+	public ImGroupMemberDto queryMember(String imGroupId, Integer userId) {
 		return imGroupDao.queryMember(imGroupId, userId);
 	}
 

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

@@ -774,7 +774,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         studentPreRegistrationDao.insert(studentPreRegistration);
         // 添加成员
-        imGroupMemberService.join(Long.parseLong(musicGroupId), user.getId(), null, false);
+        imGroupMemberService.join(musicGroupId, user.getId(), null, false);
         TenantContextHolder.clearTenantId();
         return true;
     }
@@ -1879,7 +1879,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupDao.update(musicGroup);
 
         // 创建群
-        imGroupService.create(Long.parseLong(musicGroupId), null, "乐团预报名", null, musicGroup.getName(), musicGroup.getName(), null, GroupType.MUSIC.getCode());
+        imGroupService.create(musicGroupId, null, "乐团预报名", null, musicGroup.getName(), musicGroup.getName(), null, GroupType.MUSIC.getCode());
 
         Map<Integer, String> userRoleMap = new HashMap<Integer, String>();
 
@@ -1896,7 +1896,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             userRoleMap.put(musicGroup.getTransactionTeacherId(), "衔接老师");
         }
         // 添加成员
-        imGroupMemberService.join(Long.parseLong(musicGroupId), userRoleMap);
+        imGroupMemberService.join(musicGroupId, userRoleMap);
         //缴费老师推送消息
         sendSeoMessageSource.sendSeoMessage(musicGroup.getOrganId(), null,
                 null, musicGroup.getEducationalTeacherId(), MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_ADJUST_SUCCESS, musicGroup.getName());
@@ -3644,8 +3644,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             userRoleMap.put(newMusicGroup.getTransactionTeacherId(), "衔接老师");
         }
         classGroups.forEach(e -> {
-            imGroupMemberService.quit(e.getId().longValue(), quitUserIdList);
-            imGroupMemberService.join(e.getId().longValue(), userRoleMap);
+            imGroupMemberService.quit(e.getId().toString(), quitUserIdList);
+            imGroupMemberService.join(e.getId().toString(), userRoleMap);
         });
     }
 
@@ -3690,7 +3690,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //不是导入的乐团
         if (musicGroupId.length() > 10) {
             //是否有预报名的群聊
-            ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroupId));
+            ImGroup imGroup = imGroupService.get(musicGroupId);
             if (imGroup != null) {
                 refresh = true;
                 List<Integer> quitUserIdList = new ArrayList<>();
@@ -3719,8 +3719,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (musicGroup.getTransactionTeacherId() != null) {
                     userRoleMap.put(musicGroup.getTransactionTeacherId(), "衔接老师");
                 }
-                imGroupMemberService.quit(Long.parseLong(musicGroupId), quitUserIdList);
-                imGroupMemberService.join(Long.parseLong(musicGroupId), userRoleMap);
+                imGroupMemberService.quit(musicGroupId, quitUserIdList);
+                imGroupMemberService.join(musicGroupId, userRoleMap);
             }
         }
 

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

@@ -300,8 +300,8 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
         userRoleMap.put(onlineMusicGroupCourseInfo.getTeacherId(), "指导老师");
         
         // 创建群组
-        imGroupService.create(classGroup.getId().longValue(), musicGroup.getEducationalTeacherId(), classGroup.getName(), classGroup.getName(), classGroup.getName(), classGroup.getName(), null, "MUSIC");
-        imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+        imGroupService.create(classGroup.getId().toString(), musicGroup.getEducationalTeacherId(), classGroup.getName(), classGroup.getName(), classGroup.getName(), classGroup.getName(), null, "MUSIC");
+        imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
 
         List<String> courseTimes = courses.stream().map(c -> DateUtil.dateToString(c.getStartClassTime(), "yyyy-MM-dd HH:mm")).collect(Collectors.toList());
 

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

@@ -1082,7 +1082,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             classGroupStudentMapper.setGroupType(GroupType.MUSIC);
             classGroupStudentMapperDao.insert(classGroupStudentMapper);
         }
-        imGroupMemberService.join(classGroupId.longValue(), userId, null, false);
+        imGroupMemberService.join(classGroupId.toString(), userId, null, false);
         //2、班级人数调整
 //        classGroupDao.updateClassStudentNum(classGroupId.longValue(), 1);
         //3、学生加入新班级未开始课程

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

@@ -1099,8 +1099,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 //		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
 
         try {
-            imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroupApplyBaseInfoDto.getName(), null, null, GroupType.VIP.getCode());
-            imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+            imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(), vipGroupApplyBaseInfoDto.getName(), null, null, GroupType.VIP.getCode());
+            imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
             imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
             //发送推送
             Map<Integer, String> map = new HashMap<>(1);
@@ -1503,8 +1503,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
 //		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
         try {
-            imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), applyBaseInfo.getName(), null, null, GroupType.VIP.getCode());
-            imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+            imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(), applyBaseInfo.getName(), null, null, GroupType.VIP.getCode());
+            imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
             imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
 //			SysUser sysUser = teacherDao.getUser(applyBaseInfo.getUserId());
 //			//发送推送
@@ -2549,8 +2549,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 //		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
 
         try {
-            imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
-            imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+            imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
+            imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
             imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
             //发送推送短信
             Map<Integer, String> map = new HashMap<>(1);
@@ -2855,8 +2855,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
                     courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 
-                    imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
-                    imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+                    imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
+                    imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
                     imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
                 }
                 SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(userId);
@@ -3091,7 +3091,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         classGroupDao.update(classGroup);
 
         //学员退出班级群
-        imGroupMemberService.quit(classGroup.getId().longValue(), studentId);
+        imGroupMemberService.quit(classGroup.getId().toString(), studentId);
         return BaseController.succeed();
     }
 
@@ -3244,7 +3244,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         classGroupDao.update(classGroup);
 
         //学员退出班级群
-        imGroupMemberService.quit(classGroup.getId().longValue(), studentId);
+        imGroupMemberService.quit(classGroup.getId().toString(), studentId);
     }
 
     @Override
@@ -3374,9 +3374,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         if (Objects.nonNull(studentRecoverInfo.getTeacherId()) && !studentRecoverInfo.getTeacherId().equals(vipGroup.getUserId())) {
             vipGroup.setUserId(studentRecoverInfo.getTeacherId());
 
-            imGroupMemberService.quit(classGroup.getId().longValue(), oldTeacherId);
+            imGroupMemberService.quit(classGroup.getId().toString(), oldTeacherId);
 
-            imGroupMemberService.join(classGroup.getId().longValue(), vipGroup.getUserId(), "指导老师", false);
+            imGroupMemberService.join(classGroup.getId().toString(), vipGroup.getUserId(), "指导老师", false);
         }
 
         ClassGroupStudentMapper classStudentMapperByUserIdAndClassGroupId = classGroupStudentMapperDao.query(classGroup.getId(),
@@ -3744,7 +3744,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 courseScheduleTeacherSalaryService.updateVipGroupCourseTeacherSalary(Integer.parseInt(studentPaymentOrder.getMusicGroupId()), null);
 
                 //学员退出班级群
-                imGroupMemberService.quit(studentPaymentOrder.getClassGroupId().longValue(), studentApplyRefunds.getUserId());
+                imGroupMemberService.quit(studentPaymentOrder.getClassGroupId().toString(), studentApplyRefunds.getUserId());
 
                 break;
             case REJECT:
@@ -4076,13 +4076,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(oldVipGroupInfo.getId().toString(), GroupType.VIP.getCode());
             if (Objects.nonNull(oldVipGroupInfo.getEducationalTeacherId())) {
 
-                imGroupMemberService.quit(classGroup.getId().longValue(), oldVipGroupInfo.getEducationalTeacherId());
+                imGroupMemberService.quit(classGroup.getId().toString(), oldVipGroupInfo.getEducationalTeacherId());
             }
 
             oldVipGroupInfo.setEducationalTeacherId(vipGroupApplyBaseInfo.getEducationalTeacherId());
             isChange = true;
 
-            imGroupMemberService.join(classGroup.getId().longValue(), oldVipGroupInfo.getEducationalTeacherId(), "乐团主管", false);
+            imGroupMemberService.join(classGroup.getId().toString(), oldVipGroupInfo.getEducationalTeacherId(), "乐团主管", false);
         }
         if (Objects.nonNull(vipGroupApplyBaseInfo.getOrganId()) && !vipGroupApplyBaseInfo.getOrganId().equals(oldVipGroupInfo.getOrganId())) {
             isChange = true;
@@ -4213,7 +4213,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 //		courseScheduleStudentPaymentService.updateVipGiveCourse(vipGroup.getId());
 
-        imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+        imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
     }
 
     @Override
@@ -4365,8 +4365,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             classGroupDao.update(classGroup);
 
             try {
-                imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
-                imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+                imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
+                imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
                 imUserFriendService.refreshClassImUserFriend(classGroup.getId());
             } catch (Exception e) {
                 e.printStackTrace();
@@ -4493,8 +4493,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         studentDao.updateStudentServiceTag(null, studentIds, YesOrNoEnum.YES.getCode());
 
         try {
-            imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
-            imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+            imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
+            imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
 
             imUserFriendService.refreshGroupImUserFriend(vipGroup.getId().toString(), GroupType.VIP);
         } catch (Exception e) {
@@ -4577,7 +4577,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 Set<Integer> classGroupIds = classGroupDao.queryClassGroupIds(collect);
                 //解散群
                 for (Integer classGroupId : classGroupIds) {
-                    imGroupService.cancel(classGroupId.longValue());
+                    imGroupService.cancel(classGroupId.toString());
                 }
             }
         }

mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -73,7 +73,7 @@ public class CourseController extends BaseController {
 
     @ApiOperation(value = "获取最新一条群公告")
     @RequestMapping("/getNewNotice")
-    public Object getNewNotice(Long groupId) {
+    public Object getNewNotice(String groupId) {
         return succeed(imGroupNoticeService.queryLatestNotice(groupId));
     }
 

mec-student/src/main/java/com/ym/mec/student/controller/ImGroupController.java

@@ -1,24 +1,22 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ImUserFriendDto;
+import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
+import com.ym.mec.biz.service.ImGroupNoticeService;
+import com.ym.mec.biz.service.ImGroupService;
+import com.ym.mec.biz.service.ImUserFriendService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Objects;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
-import com.ym.mec.biz.service.ImGroupNoticeService;
-import com.ym.mec.biz.service.ImGroupService;
-import com.ym.mec.biz.service.ImUserFriendService;
-import com.ym.mec.common.controller.BaseController;
+import java.util.Objects;
 
 @RequestMapping("imGroup")
 @Api(tags = "IM群服务")
@@ -54,19 +52,19 @@ public class ImGroupController extends BaseController {
 		if (imGroupId.contains("S") || imGroupId.contains("I")){
 			imGroupId = imGroupId.substring(1);
 		}
-		return succeed(imGroupService.get(Long.parseLong(imGroupId)));
+		return succeed(imGroupService.get(imGroupId));
 	}
 
 	@ApiOperation("查询群成员列表")
 	@GetMapping(value = "/queryGroupMemberList")
-	public Object queryGroupMemberList(Long imGroupId) {
+	public Object queryGroupMemberList(String imGroupId) {
 
 		return succeed(imGroupService.queryMemberById(imGroupId));
 	}
 
 	@ApiOperation("查询群成员详情")
 	@GetMapping(value = "/queryGroupMemberDetail")
-	public Object queryGroupMemberDetail(Long imGroupId, Integer userId) {
+	public Object queryGroupMemberDetail(String imGroupId, Integer userId) {
 
 		return succeed(imGroupService.queryMember(imGroupId, userId));
 	}

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ClassGroupController.java

@@ -92,7 +92,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "获取最新一条群公告")
     @RequestMapping("/getNewNotice")
-    public Object getNewNotice(Long groupId) {
+    public Object getNewNotice(String groupId) {
         return succeed(imGroupNoticeService.queryLatestNotice(groupId));
     }
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -1,27 +1,24 @@
 package com.ym.mec.teacher.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.ImUserFriendDto;
+import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
+import com.ym.mec.biz.service.ImGroupNoticeService;
+import com.ym.mec.biz.service.ImGroupService;
+import com.ym.mec.biz.service.ImUserFriendService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.ImUserFriendDto;
-import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
-import com.ym.mec.biz.service.ImGroupNoticeService;
-import com.ym.mec.biz.service.ImGroupService;
-import com.ym.mec.biz.service.ImUserFriendService;
-import com.ym.mec.common.controller.BaseController;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 @RequestMapping("imGroup")
 @Api(tags = "IM群服务")
@@ -57,25 +54,25 @@ public class ImGroupController extends BaseController {
 		if (imGroupId.contains("S") || imGroupId.contains("I")){
 			imGroupId = imGroupId.substring(1);
 		}
-		return succeed(imGroupService.get(Long.parseLong(imGroupId)));
+		return succeed(imGroupService.get(imGroupId));
 	}
 
 	@ApiOperation("查询群成员列表")
 	@GetMapping(value = "/queryGroupMemberList")
-	public Object queryGroupMemberList(Long imGroupId) {
+	public Object queryGroupMemberList(String imGroupId) {
 		return succeed(imGroupService.queryMemberById(imGroupId));
 	}
 
 	@ApiOperation("查询群学生列表")
 	@GetMapping(value = "/queryGroupStudentList")
-	public Object queryGroupStudentList(Long imGroupId) {
+	public Object queryGroupStudentList(String imGroupId) {
 
 		return succeed(imGroupService.queryMemberById(imGroupId).stream().filter(e -> StringUtils.isBlank(e.getRoleType())).collect(Collectors.toList()));
 	}
 
 	@ApiOperation("查询群成员详情")
 	@GetMapping(value = "/queryGroupMemberDetail")
-	public Object queryGroupMemberDetail(Long imGroupId, Integer userId) {
+	public Object queryGroupMemberDetail(String imGroupId, Integer userId) {
 
 		return succeed(imGroupService.queryMember(imGroupId, userId));
 	}

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -12,8 +12,6 @@ import com.ym.mec.biz.service.ImGroupService;
 import com.ym.mec.biz.service.ImUserFriendService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -21,6 +19,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
@@ -47,6 +46,7 @@ public class ImGroupController extends BaseController {
 	@Autowired
 	private ImGroupNoticeService imGroupNoticeService;
 
+	@Qualifier("")
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 
@@ -66,7 +66,7 @@ public class ImGroupController extends BaseController {
 		if (imGroupId.contains("S") || imGroupId.contains("I")){
 			imGroupId = imGroupId.substring(1);
 		}
-		return succeed(imGroupService.get(Long.parseLong(imGroupId)));
+		return succeed(imGroupService.get(imGroupId));
 	}
 
 	@ApiOperation("修改群信息")
@@ -85,19 +85,19 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("查询群成员列表")
 	@GetMapping(value = "/queryGroupMemberList")
-	public HttpResponseResult<List<ImGroupMemberDto>> queryGroupMemberList(Long imGroupId) {
+	public HttpResponseResult<List<ImGroupMemberDto>> queryGroupMemberList(String imGroupId) {
 		return succeed(imGroupService.queryMemberById(imGroupId));
 	}
 
 	@ApiOperation("查询群学生列表")
 	@GetMapping(value = "/queryGroupStudentList")
-	public HttpResponseResult<List<ImGroupMemberDto>> queryGroupStudentList(Long imGroupId) {
+	public HttpResponseResult<List<ImGroupMemberDto>> queryGroupStudentList(String imGroupId) {
 		return succeed(imGroupService.queryMemberById(imGroupId).stream().filter(e -> StringUtils.isBlank(e.getRoleType())).collect(Collectors.toList()));
 	}
 
 	@ApiOperation("查询群成员详情")
 	@GetMapping(value = "/queryGroupMemberDetail")
-	public HttpResponseResult<ImGroupMemberDto> queryGroupMemberDetail(Long imGroupId, Integer userId) {
+	public HttpResponseResult<ImGroupMemberDto> queryGroupMemberDetail(String imGroupId, Integer userId) {
 		return succeed(imGroupService.queryMember(imGroupId, userId));
 	}
 
@@ -156,30 +156,30 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("添加群成员")
 	@PostMapping(value = "/addGroupMember")
-	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "Integer"),
+	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "roleType", value = "指导老师,乐队指导,乐团主管,运营主管,学员不传", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "isAdmin", value = "是否管理员", required = true, dataType = "Boolean"),
 			@ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer")})
-	public Object addGroupMember(Long imGroupId, Integer userId, String roleType, boolean isAdmin) {
+	public Object addGroupMember(String imGroupId, Integer userId, String roleType, boolean isAdmin) {
 		return succeed(imGroupMemberService.join(imGroupId,userId,roleType,isAdmin));
 	}
 
 	@ApiOperation("退群")
 	@PostMapping(value = "/quitGroup")
 	@AuditLogAnnotation(operateName = "退群",interfaceURL = "imGroup/quitGroup")
-	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "Integer"),
+	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "String")})
-	public Object quitGroup(Long imGroupId, String userId) {
+	public Object quitGroup(String imGroupId, String userId) {
 		List<Integer> userIds = Arrays.stream(userId.split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toList());
 		return succeed(imGroupMemberService.quit(imGroupId,userIds));
 	}
 
 	@ApiOperation("修改角色")
 	@PostMapping(value = "/updateRoleType")
-	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "Integer"),
+	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "roleType", value = "指导老师,乐队指导,乐团主管,运营主管,学员不传", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer")})
-	public Object updateRoleType(Long imGroupId, Integer userId, String roleType) {
+	public Object updateRoleType(String imGroupId, Integer userId, String roleType) {
 		return succeed(imGroupMemberService.updateRoleType(imGroupId,userId,roleType));
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -130,8 +130,8 @@ public class VipGroupManageController extends BaseController {
                 }
             }
 
-            imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
-            imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+            imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
+            imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
             imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(),classGroup.getGroupType());
         }
         vipGroupService.update(vipGroup);

mec-web/src/main/java/com/ym/mec/web/controller/education/ImGroupNoticeController.java

@@ -57,7 +57,7 @@ public class ImGroupNoticeController extends BaseController {
     @ApiOperation(value = "获取最新一条群公告")
     @RequestMapping("/getNewNotice")
     @PreAuthorize("@pcs.hasPermissions('imGroupNotice/getNewNotice','system')")
-    public Object getNewNotice(Long groupId) {
+    public Object getNewNotice(String groupId) {
         return succeed(imGroupNoticeService.queryLatestNotice(groupId));
     }