Merge remote-tracking branch 'origin/master'

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

@@ -31,7 +31,7 @@ public class CourseSchedule {
 
 		SINGLE("SINGLE", "单技课"), MIX("MIX", "合奏课"), HIGH("HIGH", "小班课"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), COMPREHENSIVE("COMPREHENSIVE", "综合课"), PRACTICE(
 				"PRACTICE", "网管课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"), TRAINING_SINGLE("TRAINING_SINGLE", "集训单技课"), TRAINING_MIX("TRAINING_MIX", "集训合奏课"), CLASSROOM(
-				"CLASSROOM", "课堂课"),COMM("COMM","对外课程"),HIGH_ONLINE("HIGH_ONLINE","线上小班课");
+				"CLASSROOM", "课堂课"),COMM("COMM","对外课程"),HIGH_ONLINE("HIGH_ONLINE","乐团网管课");
 
 		private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClassGroupTypeEnum.java

@@ -7,7 +7,7 @@ import com.ym.mec.common.enums.BaseEnum;
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
 	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), PRACTICE("PRACTICE", "网管课"), SNAP("SNAP",
-			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "线上小班课");
+			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "乐团网管课");
 
 	private String code;
 

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

@@ -642,10 +642,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         String waringStr = "";
         for (ClassGroupTeachersDto classGroupAndTeacher : classGroupAndTeachers) {
+            //所有教师列表
+            List<Integer> teacherUserIds = classGroupAndTeacher.getClassGroupTeacherMapperList().stream().map(ClassGroupTeacherMapper::getUserId).collect(Collectors.toList());
+            List<Teacher> teachers = teacherDao.findByTeacherIds(teacherUserIds);
+            Map<Integer, Teacher> teacherMap = teachers.stream()
+                    .collect(Collectors.toMap(Teacher::getId, teacher -> teacher));
+
             Long studentNum = classGroupStudentNumMap.get(classGroupAndTeacher.getId());
             studentNum = Objects.isNull(studentNum) ? 0 : studentNum;
             if(classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) && (studentNum < 3 || studentNum > 5)){
-                String numWaring = studentNum < 3 ? "人数不能小于3\r\n" : "人数不能大于5\r\n";
+                String numWaring = studentNum < 3 ? "人数不能小于3，" : "人数不能大于5，";
                 waringStr += classGroupAndTeacher.getName()+numWaring;
             }
             //班级的教师列表
@@ -661,14 +667,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 List<TeacherDefaultMusicGroupSalary> teacherSalaryByUserIdAndType = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(classGroupTeacherMapper.getUserId(), courseType, type);
                 //老师课酬没有设置，设置成0
                 if (teacherSalaryByUserIdAndType == null || teacherSalaryByUserIdAndType.size() == 0) {
-                    TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = new TeacherDefaultMusicGroupSalary();
-                    teacherDefaultMusicGroupSalary.setAssistantTeacher30MinSalary(zeroSalary);
-                    teacherDefaultMusicGroupSalary.setMainTeacher30MinSalary(zeroSalary);
-                    teacherDefaultMusicGroupSalary.setMainTeacher90MinSalary(zeroSalary);
-                    teacherDefaultMusicGroupSalary.setAssistantTeacher90MinSalary(zeroSalary);
-                    teacherDefaultMusicGroupSalary.setUserId(classGroupTeacherMapper.getUserId());
-                    teacherDefaultMusicGroupSalary.setCourseScheduleType(CourseSchedule.getCourseScheduleTypeByCode(courseType));
-                    teacherSalaryByUserIdAndType.add(teacherDefaultMusicGroupSalary);
+                    Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
+                    throw new BizException("请设置"+teacher.getRealName()+"老师"+classGroupAndTeacher.getType().getMsg()+"课酬");
                 }
 
                 for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherSalaryByUserIdAndType) {
@@ -1547,11 +1547,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     if(teacherDefaultMusicGroupSalary == null){
                         throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
                     }
-                    if (teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
+                    if ((teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
                             || teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary() == null
                             || teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() == null
-                            || teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null
-                            || teacherDefaultMusicGroupSalary.getSalaryRuleJson() == null) {
+                            || teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null)
+                            && teacherDefaultMusicGroupSalary.getSalaryRuleJson() == null) {
                         throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
                     }
 

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

@@ -4103,6 +4103,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				//统计授课次数
 				resultMap.put("teacherGiveLesson",courseScheduleTeacherSalaryDao.countTeacherGiveLesson(coursesGroup.getTeacherId()));
 				break;
+			case MUSIC:
+				MusicGroup musicGroup = musicGroupDao.get(groupId);
+				resultMap.put("groupName",musicGroup.getName());
+				resultMap.put("groupStatus",musicGroup.getStatus().getCode());
+				teacher = teacherDao.get(musicGroup.getEducationalTeacherId());
+				resultMap.put("groupTeacher",teacher.getRealName());
+				resultMap.put("teacherIntroduction",teacher.getIntroduction());
+				resultMap.put("teacherAvatar",teacher.getAvatar());
+				//统计授课次数
+				resultMap.put("teacherGiveLesson",courseScheduleTeacherSalaryDao.countTeacherGiveLesson(musicGroup.getEducationalTeacherId()));
+				break;
 			default:
 				throw new BizException("课程类型错误");
 		}

mec-im/src/main/java/com/ym/pojo/CustomMessage.java

@@ -51,7 +51,7 @@ public class CustomMessage extends BaseMessage {
         return "{\"enable\":" + enable +
                 ", \"customType\":" + customType +
                 ", \"rate\":" + rate +
-                ", \"userId\":" + (StringUtils.isEmpty(userId)?"\"\"":userId) +
+                ", \"userId\":" + (StringUtils.isEmpty(userId)?"\"\"":"\"" + userId + "\"") +
                 '}';
     }
 }

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -138,15 +138,6 @@ public class RoomServiceImpl implements RoomService {
                 break;
             }
         }
-        /*try {
-            if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
-                teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId),courseSchedule.getActualTeacherId(), SignStatusEnum.SIGN_IN,true);
-            }else {
-                studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_IN);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-        }*/
         if(courseSchedule.getGroupType() == GroupType.COMM){
             roomId = "I" + roomId;
         }else {
@@ -194,10 +185,11 @@ public class RoomServiceImpl implements RoomService {
             userResult.setJoinTime(curTime);
             log.info("user join the room: roomId={} , userId={}, roleEnum={}, memCount: {}", roomId, userId, roleEnum, count);
         } else {
-            roleEnum = RoleEnum.getEnumByValue(memberList.get(0).getRole());
+            RoomMember roomMember = memberList.get(0);
+            roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
 //            roomMemberDao.updateCameraByRidAndUid(roomId, userId, !isDisableCamera);
-            userResult.setCamera(!isDisableCamera);
-            userResult.setJoinTime(memberList.get(0).getJoinDt());
+            userResult.setCamera(roomMember.isCamera());
+            userResult.setJoinTime(roomMember.getJoinDt());
 
             log.info("user exist in the room: roomId={} , userId={}, use the last role={}", roomId, userId, roleEnum);
         }