update

edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/RoomMember.java

@@ -24,9 +24,7 @@ public class RoomMember {
     private @Getter @Setter Date joinDt;
     private @Getter @Setter String name;
     private @Getter @Setter boolean camera = true;
-    private @Getter @Setter boolean musicMode = true;
     private @Getter @Setter boolean mic = true;
-    private @Getter @Setter boolean hand = false;
     private @Getter @Setter boolean msidFlag = false;
 
     public RoomMember() {
@@ -50,12 +48,7 @@ public class RoomMember {
                 ", joinDt=" + joinDt +
                 ", name='" + name + '\'' +
                 ", camera=" + camera +
-                ", musicMode=" + musicMode +
                 ", mic=" + mic +
                 '}';
     }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "room_id", referencedColumnName = "rid")
-//    private @Getter @Setter Room room;
 }

edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/RoomResult.java

@@ -33,7 +33,6 @@ public class RoomResult {
         Date joinTime;
         boolean camera;
         boolean microphone;
-        boolean handUp;
         String shieldUserId;
     }
 
@@ -53,7 +52,6 @@ public class RoomResult {
             result.setMicrophone(member.isMic());
             result.setCamera(member.isCamera());
             result.setUserName(member.getName());
-            result.setHandUp(member.isHand());
             result.setHeadUrl(member.getHeadUrl());
             result.setShieldUserId(shieldUserId);
             members.add(result);

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -29,7 +29,6 @@ import com.keao.edu.user.api.client.EduUserFeignService;
 import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import com.keao.edu.user.api.enums.StudentExamApiDto;
-import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,7 +76,7 @@ public class RoomServiceImpl implements RoomService {
         return baseResponse;
     }
 
-    public void exitRoom(String roomId,String userId){
+    /*public void exitRoom(String roomId,String userId){
         List<RoomMember> byRidAndRole = roomMemberDao.findByRidAndRole(roomId, 3);
         if(byRidAndRole != null && byRidAndRole.size() > 0){
             log.info("学员加入时，将其他学员退出房间 byRidAndRole{}",byRidAndRole);
@@ -96,7 +95,7 @@ public class RoomServiceImpl implements RoomService {
                 }
             }
         }
-    }
+    }*/
 
     public void joinRoomSuccess(RoomMember roomMember) throws Exception {
         String roomId = roomMember.getRid();
@@ -106,7 +105,7 @@ public class RoomServiceImpl implements RoomService {
 
         Date curTime = DateTimeUtils.currentUTC();
         if (!roomDao.existsByRid(roomId)) {
-            saveRoom(roomId,curTime, null);
+            saveRoom(roomId,curTime);
         }
 //        UserInfo userInfo = userDao.findByUid(userId);
         if(!userDao.existsByUid(userId)){
@@ -164,7 +163,7 @@ public class RoomServiceImpl implements RoomService {
         }
         Date curTime = DateTimeUtils.currentUTC();
         if (!roomDao.existsByRid(roomId)) {
-            saveRoom(roomId,curTime, null);
+            saveRoom(roomId,curTime);
         }
         RoleEnum roleEnum;
         RoomResult roomResult = new RoomResult();
@@ -213,7 +212,6 @@ public class RoomServiceImpl implements RoomService {
         }
         userResult.setMicrophone(roomMember.isMic());
         userResult.setCamera(roomMember.isCamera());
-        userResult.setHandUp(roomMember.isHand());
         userResult.setJoinTime(roomMember.getJoinDt());
         userResult.setUserName(realName);
         userResult.setUserId(userId);
@@ -228,12 +226,11 @@ public class RoomServiceImpl implements RoomService {
         return baseResponse;
     }
 
-    private void saveRoom(String roomId,Date createTime, String display) {
+    private void saveRoom(String roomId,Date createTime) {
         Room room = new Room();
         room.setRid(roomId);
         room.setName(roomId);
         room.setCreateDt(createTime);
-        room.setDisplay(display);
         roomDao.save(room);
     }