fix

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ImNetworkRoomResult.java

@@ -26,7 +26,7 @@ public class ImNetworkRoomResult extends ImNetworkRoom {
     private ImNetworkRoomMember roomMember;
 
     @ApiModelProperty(value = "节拍器参数")
-    private ImNetworkMetronomeMessage midiJson = new ImNetworkMetronomeMessage();
+    private ImNetworkMetronomeMessage playMidiJson = new ImNetworkMetronomeMessage();
 
     @ApiModelProperty("RTC接入参数")
     private RTCRoomConfig rtcRoomConfig;

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 cameraFlag;
+    private boolean camera;
 
     @TableField("mic_flag_")
     @ApiModelProperty(value = "是否开启麦克风")
-    private boolean micFlag;
+    private boolean microphone;
 
     @TableField("music_mode_flag_")
     @ApiModelProperty(value = "是否开启音乐模式")
-    private boolean musicModeFlag;
+    private boolean musicModeOn;
 
     @TableField("hand_flag_")
     @ApiModelProperty(value = "是否举手")
-    private boolean handFlag;
+    private boolean handUpOn;
 
     @ApiModelProperty(value = "当前用户伴奏信息")
     @TableField(exist = false)

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

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

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

@@ -141,7 +141,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             setMusicSheetList(roomMemberList,Long.parseLong(roomId));
         }else {
             //获取节拍器信息
-            joinRoomResult.setMidiJson(imNetworkRoomMemberStatusService.getMemberMidi(roomId, sysUser.getUserId()));
+            joinRoomResult.setPlayMidiJson(imNetworkRoomMemberStatusService.getMemberMidi(roomId, sysUser.getUserId()));
         }
         //课程结束后关闭教室的时间
         joinRoomResult.setAutoCloseNetworkRoomTime(sysConfigDao.findConfigValue(SysConfigConstant.DESTROY_EXPIRED_PRACTICE_ROOM_MINUTE));
@@ -203,7 +203,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             setMusicSheetList(roomMemberList,Long.parseLong(roomId));
         }else {
             //获取节拍器信息
-            joinRoomResult.setMidiJson(imNetworkRoomMemberStatusService.getMemberMidi(roomId, sysUser.getUserId()));
+            joinRoomResult.setPlayMidiJson(imNetworkRoomMemberStatusService.getMemberMidi(roomId, sysUser.getUserId()));
         }
         //课程结束后关闭教室的时间
         joinRoomResult.setAutoCloseNetworkRoomTime(sysConfigDao.findConfigValue(SysConfigConstant.DESTROY_EXPIRED_PRACTICE_ROOM_MINUTE));

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

@@ -68,12 +68,11 @@ public class ImServiceImpl implements ImService {
             RTCRoomMessage.MessageContent.MessageContentBuilder action = RTCRoomMessage.MessageContent.builder()
                     .action(EMemberAction.JOIN.getValue());
 
-            action.handUpOn(roomMember.isHandFlag())
-                    .microphone(roomMember.isMicFlag())
+            action.handUpOn(roomMember.isHandUpOn())
+                    .microphone(roomMember.isMicrophone())
                     .timestamp(new Date().getTime())
-                    .camera(roomMember.isCameraFlag())
+                    .camera(roomMember.isCamera())
                     .role(roomMember.getRole())
-                    .microphone(roomMember.isMicFlag())
                     .sendUserInfo(this.getSendUser(roomMember));
 
             RTCRoomMessage roomMessage = RTCRoomMessage.builder()
@@ -291,16 +290,16 @@ public class ImServiceImpl implements ImService {
                     .orElseThrow(()-> new BizException("用户不在房间内"));
             switch (deviceControl.getDeviceType()) {
                 case CAMERA:
-                    roomMember.setCameraFlag(deviceControl.getEnable());
+                    roomMember.setCamera(deviceControl.getEnable());
                     break;
                 case MICROPHONE:
-                    roomMember.setMicFlag(deviceControl.getEnable());
+                    roomMember.setMicrophone(deviceControl.getEnable());
                     break;
                 case HAND_UP:
-                    roomMember.setHandFlag(deviceControl.getEnable());
+                    roomMember.setHandUpOn(deviceControl.getEnable());
                     break;
                 case MUSIC_MODE:
-                    roomMember.setMusicModeFlag(deviceControl.getEnable());
+                    roomMember.setMusicModeOn(deviceControl.getEnable());
                     break;
                 case EXAM_SONG:
                     ImNetworkRoomMusicSheetDownloadData msg = imNetworkRoomMemberStatusService.getMemberExamSong(roomId, roomMember.getUserId());
@@ -333,7 +332,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.setCameraFlag(deviceControl.getEnable());
+                roomMember.setCamera(deviceControl.getEnable());
                 break;
             case EXAM_SONG:
                 ImNetworkRoomMusicSheetDownloadData msg = imNetworkRoomMemberStatusService.getMemberExamSong(roomMember.getRoomId(), roomMember.getUserId());
@@ -344,7 +343,7 @@ public class ImServiceImpl implements ImService {
                         .set(ImNetworkRoomMemberStatus::getMusicSheetDownloadJson,JSON.toJSONString(msg)).update();
                 break;
             case MICROPHONE:
-                roomMember.setMicFlag(deviceControl.getEnable());
+                roomMember.setMicrophone(deviceControl.getEnable());
                 break;
         }
         if(deviceControl.getDeviceType() == ImNetworkDeviceTypeEnum.CAMERA ||
@@ -416,16 +415,16 @@ public class ImServiceImpl implements ImService {
         ImNetworkDeviceTypeEnum deviceType = deviceStatusSync.getDeviceType();
         switch (deviceType) {
             case CAMERA:
-                roomMember.setCameraFlag(deviceStatusSync.getEnable());
+                roomMember.setCamera(deviceStatusSync.getEnable());
                 break;
             case MICROPHONE:
-                roomMember.setMicFlag(deviceStatusSync.getEnable());
+                roomMember.setMicrophone(deviceStatusSync.getEnable());
                 break;
             case HAND_UP:
-                roomMember.setHandFlag(deviceStatusSync.getEnable());
+                roomMember.setHandUpOn(deviceStatusSync.getEnable());
                 break;
             case MUSIC_MODE:
-                roomMember.setMusicModeFlag(deviceStatusSync.getEnable());
+                roomMember.setMusicModeOn(deviceStatusSync.getEnable());
                 break;
             case EXAM_SONG:
                 ImNetworkRoomMusicSheetDownloadData msg = imNetworkRoomMemberStatusService.getMemberExamSong(roomMember.getRoomId(), roomMember.getUserId());