Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -3114,7 +3114,7 @@
         WHERE cs.class_group_id_ = #{classGroupId}
         AND TIMESTAMPDIFF(MINUTE, CONCAT(cs.class_date_," ",cs.end_class_time_),#{startTime}) <= #{continueCourseTime}
         AND TIMESTAMPDIFF(MINUTE, CONCAT(cs.class_date_," ",cs.end_class_time_),#{startTime}) >= 0
-        AND cs.actual_teacher_id_ = #{teacherId}
+        AND cs.actual_teacher_id_ = #{teacherId} AND (ta.sign_in_time_ IS NOT NULL OR sa.id_ IS NOT NULL)
         ORDER BY cs.class_date_ DESC,cs.end_class_time_ DESC
         LIMIT 1
     </select>

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

@@ -173,6 +173,11 @@ public class RoomServiceImpl implements RoomService {
             display = "display://type=1?userId=" + userId + "?uri=";
         } else if (roleEnum == RoleEnum.RoleAssistant && display.isEmpty()) {
             display = "display://type=0?userId=" + userId + "?uri=";
+        }else {
+            Room room = roomDao.findByRid(roomId);
+            if (room != null) {
+                display = room.getDisplay();
+            }
         }
 
         userResult.setUserName(userName);
@@ -217,10 +222,12 @@ public class RoomServiceImpl implements RoomService {
             //如果是老师加入房间，调整节拍器状态
             courseScheduleStudentPaymentDao.adjustPlayMidi(schedule.getId(),null,null);
             display = "display://type=1?userId=" + userId + "?uri=";
+            updateDisplay(roomId, userId, display, 0);
         }else if (roleEnum == RoleEnum.RoleAssistant){
             display = "display://type=0?userId=" + userId + "?uri=";
+            updateDisplay(roomId, userId, display, 0);
         }
-        updateDisplay(roomId, userId, display, 0);
+
         Date curTime = DateTimeUtils.currentUTC();
         Room room = roomDao.findByRid(roomId);
         if (room == null) {
@@ -334,7 +341,7 @@ public class RoomServiceImpl implements RoomService {
             imHelper.dismiss(userId, roomId);
             log.info("leaveRoomSuccess dismiss the room: {},userId: {}", roomId,userId);
         } else {
-            imHelper.quit(new String[]{userId}, roomId);
+//            imHelper.quit(new String[]{userId}, roomId);
             roomMemberDao.deleteUserByRidAndUid(roomId, userId);
             MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Leave, userId, roleEnum.getValue());
             msg.setUserName(roomMember.getName());