update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ImNetworkRoomMember.java

@@ -53,19 +53,19 @@ public class ImNetworkRoomMember implements Serializable {
 
     @TableField("camera_flag_")
     @ApiModelProperty(value = "是否开启摄像头;")
-    private boolean camera;
+    private boolean cameraFlag;
 
     @TableField("mic_flag_")
     @ApiModelProperty(value = "是否开启麦克风")
-    private boolean microphone;
+    private boolean micFlag;
 
     @TableField("music_mode_flag_")
     @ApiModelProperty(value = "是否开启音乐模式")
-    private boolean musicModeOn;
+    private boolean musicModeFlag;
 
     @TableField("hand_flag_")
     @ApiModelProperty(value = "是否举手")
-    private boolean handUpOn;
+    private boolean handFlag;
 
     @ApiModelProperty(value = "当前用户伴奏信息")
     @TableField(exist = false)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomMemberServiceImpl.java

@@ -49,10 +49,10 @@ public class ImNetworkRoomMemberServiceImpl extends ServiceImpl<ImNetworkRoomMem
         if(Objects.isNull(roomMember)){
             roomMember = new ImNetworkRoomMember();
             roomMember.setRoomId(roomId);
-            roomMember.setCamera(true);
-            roomMember.setHandUpOn(false);
-            roomMember.setMicrophone(microphone);
-            roomMember.setMusicModeOn(false);
+            roomMember.setCameraFlag(true);
+            roomMember.setHandFlag(false);
+            roomMember.setMicFlag(microphone);
+            roomMember.setMusicModeFlag(false);
             roomMember.setRole(userRole.getValue());
             roomMember.setUserName(sysUser.getUsername());
             roomMember.setAvatar(sysUser.getAvatar());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -123,6 +123,10 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         }
         ImNetworkRoomMemberResult memberResult = JSONObject.parseObject(JSONObject.toJSONString(roomMember), ImNetworkRoomMemberResult.class);
         memberResult.setJoinTime(roomMember.getJoinTime().getTime());
+        memberResult.setCamera(roomMember.isCameraFlag());
+        memberResult.setMicrophone(roomMember.isMicFlag());
+        memberResult.setMusicModeOn(roomMember.isMusicModeFlag());
+        memberResult.setHandUpOn(roomMember.isHandFlag());
         joinRoomResult.setUserInfo(memberResult);
         //获取教室剩余时长
         joinRoomResult.setSurplusTime(DateUtil.secondsBetween(now, courseSchedule.getEndTime()));
@@ -198,6 +202,10 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         }
         ImNetworkRoomMemberResult memberResult = JSONObject.parseObject(JSONObject.toJSONString(roomMember), ImNetworkRoomMemberResult.class);
         memberResult.setJoinTime(roomMember.getJoinTime().getTime());
+        memberResult.setCamera(roomMember.isCameraFlag());
+        memberResult.setMicrophone(roomMember.isMicFlag());
+        memberResult.setMusicModeOn(roomMember.isMusicModeFlag());
+        memberResult.setHandUpOn(roomMember.isHandFlag());
         joinRoomResult.setUserInfo(memberResult);
         //获取教室剩余时长
         joinRoomResult.setSurplusTime(DateUtil.secondsBetween(new Date(), courseSchedule.getEndTime()));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImServiceImpl.java

@@ -68,10 +68,10 @@ public class ImServiceImpl implements ImService {
             RTCRoomMessage.MessageContent.MessageContentBuilder action = RTCRoomMessage.MessageContent.builder()
                     .action(EMemberAction.JOIN.getValue());
 
-            action.handUpOn(roomMember.isHandUpOn())
-                    .microphone(roomMember.isMicrophone())
+            action.handUpOn(roomMember.isHandFlag())
+                    .microphone(roomMember.isMicFlag())
                     .timestamp(new Date().getTime())
-                    .camera(roomMember.isCamera())
+                    .camera(roomMember.isCameraFlag())
                     .role(roomMember.getRole())
                     .sendUserInfo(this.getSendUser(roomMember));
 
@@ -292,16 +292,16 @@ public class ImServiceImpl implements ImService {
                     .orElseThrow(()-> new BizException("用户不在房间内"));
             switch (deviceControl.getDeviceType()) {
                 case CAMERA:
-                    roomMember.setCamera(deviceControl.getEnable());
+                    roomMember.setCameraFlag(deviceControl.getEnable());
                     break;
                 case MICROPHONE:
-                    roomMember.setMicrophone(deviceControl.getEnable());
+                    roomMember.setMicFlag(deviceControl.getEnable());
                     break;
                 case HAND_UP:
-                    roomMember.setHandUpOn(deviceControl.getEnable());
+                    roomMember.setHandFlag(deviceControl.getEnable());
                     break;
                 case MUSIC_MODE:
-                    roomMember.setMusicModeOn(deviceControl.getEnable());
+                    roomMember.setMusicModeFlag(deviceControl.getEnable());
                     break;
                 case EXAM_SONG:
                     ImNetworkRoomMusicSheetDownloadData msg = imNetworkRoomMemberStatusService.getMemberExamSong(roomId, roomMember.getUserId());
@@ -334,7 +334,7 @@ public class ImServiceImpl implements ImService {
     public void pushApproveControlDevice(ImNetworkDeviceControlDto deviceControl, ImNetworkRoomMember roomMember,BasicUserInfo student,BasicUserInfo teacher) throws Exception {
         switch (deviceControl.getDeviceType()) {
             case CAMERA:
-                roomMember.setCamera(deviceControl.getEnable());
+                roomMember.setCameraFlag(deviceControl.getEnable());
                 break;
             case EXAM_SONG:
                 ImNetworkRoomMusicSheetDownloadData msg = imNetworkRoomMemberStatusService.getMemberExamSong(roomMember.getRoomId(), roomMember.getUserId());
@@ -345,7 +345,7 @@ public class ImServiceImpl implements ImService {
                         .set(ImNetworkRoomMemberStatus::getMusicSheetDownloadJson,JSON.toJSONString(msg)).update();
                 break;
             case MICROPHONE:
-                roomMember.setMicrophone(deviceControl.getEnable());
+                roomMember.setMicFlag(deviceControl.getEnable());
                 break;
         }
         if(deviceControl.getDeviceType() == ImNetworkDeviceTypeEnum.CAMERA ||
@@ -417,16 +417,16 @@ public class ImServiceImpl implements ImService {
         ImNetworkDeviceTypeEnum deviceType = deviceStatusSync.getDeviceType();
         switch (deviceType) {
             case CAMERA:
-                roomMember.setCamera(deviceStatusSync.getEnable());
+                roomMember.setCameraFlag(deviceStatusSync.getEnable());
                 break;
             case MICROPHONE:
-                roomMember.setMicrophone(deviceStatusSync.getEnable());
+                roomMember.setMicFlag(deviceStatusSync.getEnable());
                 break;
             case HAND_UP:
-                roomMember.setHandUpOn(deviceStatusSync.getEnable());
+                roomMember.setHandFlag(deviceStatusSync.getEnable());
                 break;
             case MUSIC_MODE:
-                roomMember.setMusicModeOn(deviceStatusSync.getEnable());
+                roomMember.setMusicModeFlag(deviceStatusSync.getEnable());
                 break;
             case EXAM_SONG:
                 ImNetworkRoomMusicSheetDownloadData msg = imNetworkRoomMemberStatusService.getMemberExamSong(roomMember.getRoomId(), roomMember.getUserId());

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImNetworkRoomMemberMapper.xml

@@ -9,10 +9,10 @@
         <result column="avatar_" jdbcType="VARCHAR" property="avatar"/>
         <result column="join_time_" jdbcType="TIMESTAMP" property="joinTime"/>
         <result column="role_" jdbcType="INTEGER" property="role"/>
-        <result column="camera_flag_" jdbcType="BOOLEAN" property="camera"/>
-        <result column="mic_flag_" jdbcType="BOOLEAN" property="microphone"/>
-        <result column="music_mode_flag_" jdbcType="BOOLEAN" property="musicModeOn"/>
-        <result column="hand_flag_" jdbcType="BOOLEAN" property="handUpOn"/>
+        <result column="camera_flag_" jdbcType="BOOLEAN" property="cameraFlag"/>
+        <result column="mic_flag_" jdbcType="BOOLEAN" property="micFlag"/>
+        <result column="music_mode_flag_" jdbcType="BOOLEAN" property="musicModeFlag"/>
+        <result column="hand_flag_" jdbcType="BOOLEAN" property="handFlag"/>
     </resultMap>
 
     <insert id="insert" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
@@ -20,8 +20,8 @@
         INSERT INTO im_network_room_member(room_id_, user_id_, join_time_, role_, camera_flag_,
                                            mic_flag_, music_mode_flag_, hand_flag_,username_,avatar_)
         VALUES (#{entity.roomId}, #{entity.userId},NOW(), #{entity.role},
-                #{entity.camera}, #{entity.microphone}, #{entity.musicModeOn},
-                #{entity.handUpOn}, #{entity.userName}, #{entity.avatar})
+                #{entity.cameraFlag}, #{entity.micFlag}, #{entity.musicModeFlag},
+                #{entity.handFlag}, #{entity.userName}, #{entity.avatar})
         ON DUPLICATE KEY UPDATE
         room_id_ = VALUES(room_id_),
         user_id_ = VALUES(user_id_),