Merge remote-tracking branch 'origin/master'

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

@@ -382,9 +382,10 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * 添加IM群组
      * @param classGroup
      * @param userIds
+     * @param teacherIdList
      * @return
      */
-    Boolean addImGroup(ClassGroup classGroup,List<Integer> userIds);
+    Boolean addImGroup(ClassGroup classGroup,List<Integer> userIds, List<Integer> teacherIdList);
 
     /**
      * 检测是否设置课酬

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

@@ -34,6 +34,7 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.util.collection.ListUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -242,6 +243,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         insert(classGroup);
 
         //设置班级上的老师
+        List<Integer> teacherIdList = new ArrayList<>();
         List<ClassGroupTeacherMapper> teacherMapperList = classGroup.getTeacherMapperList();
         for (ClassGroupTeacherMapper tm : teacherMapperList) {
             tm.setClassGroupId(classGroup.getId());
@@ -249,6 +251,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             tm.setGroupType(classGroup.getGroupType());
             tm.setCreateTime(date);
             tm.setUpdateTime(date);
+            teacherIdList.add(tm.getUserId());
         }
 
         if (teacherMapperList.size() > 0) {
@@ -282,7 +285,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         // 加入IM群组
         if (userIdList.size() > 0) {
-            addImGroup(classGroup, userIdList);
+            addImGroup(classGroup, userIdList, teacherIdList);
         }
         return true;
     }
@@ -364,7 +367,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentList);
 
         //加入IM群组
-        addImGroup(classGroup, userIdList);
+        addImGroup(classGroup, userIdList, null);
         return classGroup;
     }
 
@@ -430,7 +433,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupRelationService.classGroupRelationsInsert(classGroupRelationList);
 
         //加入IM群组
-        addImGroup(classGroup, userIdList);
+        addImGroup(classGroup, userIdList, null);
 
         return classGroup;
     }
@@ -1767,12 +1770,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             throw new BizException("主教与助教存在冲突");
         }
 
+        List<Integer> teacherIds = new ArrayList<>();
         Integer teacherId = null;
         for (ClassGroupTeacherMapper groupTeacherMapper : classGroupTeacherMapperList) {
             groupTeacherMapper.setGroupType(classGroup.getGroupType());
             groupTeacherMapper.setClassGroupId(classGroup.getId());
             groupTeacherMapper.setMusicGroupId(classGroup4MixDtos.get(0).getMusicGroupId());
-            userIds.add(groupTeacherMapper.getUserId());
+            teacherIds.add(groupTeacherMapper.getUserId());
             if (groupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP)) {
                 teacherId = groupTeacherMapper.getUserId();
             }
@@ -1789,7 +1793,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 .collect(Collectors.toMap(Teacher::getId, teacher -> teacher));
 
         //创建IM群组
-        addImGroup(classGroup, userIds);
+        addImGroup(classGroup, userIds, teacherIds);
 
 
         Map<String, Integer> courseTypeMinutesMap = musicGroupPaymentCalenderCourseSettingsService.getMusicCourseSettingsWithStudents(musicGroupId, studentIdList);
@@ -2124,16 +2128,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMapperList);
 
+            List<Integer> teacherIds = new ArrayList<>();
             for (ClassGroupTeacherMapper groupTeacherMapper : classGroupTeacherMapperList) {
                 groupTeacherMapper.setGroupType(classGroup.getGroupType());
                 groupTeacherMapper.setClassGroupId(classGroup.getId());
                 groupTeacherMapper.setMusicGroupId(classGroup4MixDto.getMusicGroupId());
-                userIds.add(groupTeacherMapper.getUserId());
+                teacherIds.add(groupTeacherMapper.getUserId());
             }
             //3、将老师加入关联关系
             classGroupTeacherMapperDao.classGroupTeachersInsert(classGroupTeacherMapperList);
             //创建IM群组
-            addImGroup(classGroup, userIds);
+            addImGroup(classGroup, userIds, teacherIds);
         }
         //排课
         List<CourseSchedule> courseScheduleList = new ArrayList<>();
@@ -2483,11 +2488,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
 
         Integer teacherId = null;
+        List<Integer> teacherIds = new ArrayList<>();
         for (ClassGroupTeacherMapper groupTeacherMapper : classGroupTeacherMapperList) {
             groupTeacherMapper.setGroupType(classGroup.getGroupType());
             groupTeacherMapper.setClassGroupId(classGroup.getId());
             groupTeacherMapper.setMusicGroupId(classGroup4MixDtos.get(0).getMusicGroupId());
-            userIds.add(groupTeacherMapper.getUserId());
+            teacherIds.add(groupTeacherMapper.getUserId());
             if (groupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP)) {
                 teacherId = groupTeacherMapper.getUserId();
             }
@@ -2504,7 +2510,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 .collect(Collectors.toMap(Teacher::getId, teacher -> teacher));
 
         //创建IM群组
-        addImGroup(classGroup, userIds);
+        addImGroup(classGroup, userIds, teacherIds);
 
         Map<String, Integer> courseTypeMinutesMap = musicGroupPaymentCalenderCourseSettingsService.getMusicCourseSettingsWithStudents(musicGroupId, studentIdList);
 
@@ -2956,7 +2962,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public Boolean addImGroup(ClassGroup classGroup, List<Integer> userIds) {
+    public Boolean addImGroup(ClassGroup classGroup, List<Integer> userIds, List<Integer> teacherIdList) {
         MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
 
         Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
@@ -2969,6 +2975,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             userRoleMap.put(userId, "");
         }
         
+        if(teacherIdList != null && teacherIdList.size() > 0){
+        	for(Integer teacherId : teacherIdList){
+        		userRoleMap.put(teacherId, "指导老师");
+        	}
+        }
+        
         imGroupService.create(classGroup.getId().longValue(), musicGroup.getTeamTeacherId(), classGroup.getName(), musicGroup.getName(), musicGroup.getName(), musicGroup.getName(), null, "MUSIC");
         imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
         imUserFriendService.refreshClassImUserFriend(classGroup.getId());

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

@@ -1323,7 +1323,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupDao.update(musicGroup);
         
         // 创建群
-        imGroupService.create(Long.parseLong(musicGroupId), null, "乐团预报名", null, musicGroup.getName(), null, null, GroupType.MUSIC.getCode());
+        imGroupService.create(Long.parseLong(musicGroupId), null, "乐团预报名", null, musicGroup.getName(), musicGroup.getName(), null, GroupType.MUSIC.getCode());
         
         Map<Integer,String> userRoleMap = new HashMap<Integer, String>();