网络教室优化

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

@@ -10,8 +10,7 @@ import java.util.List;
 public interface RoomMemberDao extends BaseDAO<Integer, RoomMember> {
     List<RoomMember> queryRoomMember(@Param("roomId") String roomId,
                                      @Param("userId") String userId,
-                                     @Param("role") Integer role,
-                                     @Param("onlineFlag") Boolean onlineFlag);
+                                     @Param("role") Integer role);
 
     RoomMember findOne(@Param("roomId") String roomId, @Param("userId") String userId);
 

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

@@ -25,16 +25,6 @@ public class RoomMember {
 
     private boolean hand = false;
 
-    private Boolean onlineFlag = false;
-
-    public Boolean getOnlineFlag() {
-        return onlineFlag;
-    }
-
-    public void setOnlineFlag(Boolean onlineFlag) {
-        this.onlineFlag = onlineFlag;
-    }
-
     public long getId() {
         return id;
     }

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

@@ -104,9 +104,6 @@
 		<if test="userId != null">
 			AND uid = #{userId}
 		</if>
-		<if test="onlineFlag != null">
-			AND online_flag_ = #{onlineFlag}
-		</if>
 	</select>
 	<select id="findOne" resultMap="RoomMember">
 		SELECT * FROM rongyun_room_member WHERE rid = #{roomId}

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

@@ -192,16 +192,6 @@ public class RoomServiceImpl implements RoomService {
             userResult.setJoinTime(curTime);
             saveRoomMember(userId,sysUser.getAvatar(), userName, roomId, roleEnum.getValue(), curTime);
         } else {
-            //离线
-            if(!roomMember.getOnlineFlag()){
-                roomMember.setRole(roleEnum.getValue());
-                roomMember.setName(userName);
-                roomMember.setCamera(true);
-                roomMember.setJoinDt(curTime);
-                roomMember.setMusicMode(false);
-                roomMember.setOnlineFlag(true);
-                roomMemberDao.update(roomMember);
-            }
             if(roleEnum == RoleTeacher){
                 courseScheduleStudentPaymentDao.adjustPlayMidi(courseId,null,null);
             }
@@ -257,7 +247,7 @@ public class RoomServiceImpl implements RoomService {
         roomResult.setDisplay(display);
         roomResult.setRoomId(roomId);
 
-        List<RoomMember> roomMemberList = roomMemberDao.queryRoomMember(roomId,null,null,true);
+        List<RoomMember> roomMemberList = roomMemberDao.queryRoomMember(roomId,null,null);
         if(roomMemberList != null && roomMemberList.size() > 0){
             Set<String> userIds = roomMemberList.stream().map(e -> e.getUid()).collect(Collectors.toSet());
             Map<Integer,String> midiMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryMidiByUserIdsAndCourseId(userIds,courseId.toString()));
@@ -306,8 +296,7 @@ public class RoomServiceImpl implements RoomService {
         }
         log.info("joinRoomFailure : roomId={}, userId={}", roomId, userId);
         //如果加入失败，删除该用户数据
-        roomMember.setOnlineFlag(false);
-        roomMemberDao.update(roomMember);
+        roomMemberDao.deleteRoomMember(roomId, userId);
     }
 
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
@@ -439,7 +428,6 @@ public class RoomServiceImpl implements RoomService {
         roomMember.setJoinDt(joinTime);
         roomMember.setMusicMode(false);
         roomMember.setHeadUrl(headUrl);
-        roomMember.setOnlineFlag(true);
         roomMemberDao.insert(roomMember);
         return roomMember;
     }