update

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -25,7 +25,7 @@ public class RoomController{
     @RequestMapping(value = "/join", method = RequestMethod.POST)
     public Object joinRoom(@RequestBody ReqUserData data)
             throws ApiException, Exception {
-        RoomResult roomResult = roomService.joinRoom(data.getUserName(), data.getRoomId(), data.isAudience(), data.isDisableCamera(),data.isMusicMode());
+        RoomResult roomResult = roomService.joinRoom(data.getUserName(), data.getRoomId(), data.isAudience(), data.isDisableCamera());
         return new BaseResponse<>(roomResult);
     }
 
@@ -130,8 +130,6 @@ public class RoomController{
             result = roomService.controlDevice(data.getRoomId(), data.getUserId(), DeviceTypeEnum.Camera, data.getCameraOn());
         } else if (data.getMicrophoneOn() != null) {
             result = roomService.controlDevice(data.getRoomId(), data.getUserId(), DeviceTypeEnum.Microphone, data.getMicrophoneOn());
-        } else if (data.getMusicModeOn() != null) {
-            result = roomService.controlDevice(data.getRoomId(), data.getUserId(), DeviceTypeEnum.MusicMode, data.getMusicModeOn());
         } else {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);
         }
@@ -224,9 +222,9 @@ public class RoomController{
 
     @RequestMapping(value = "/members/online-status", method = RequestMethod.POST)
     public Object memberOnlineStatus(@RequestBody List<ReqMemberOnlineStatus> statusList,
-                                                    @RequestParam(value = "timestamp", required = false) String timestamp,
-                                                    @RequestParam(value = "nonce", required = false) String nonce,
-                                                    @RequestParam(value = "signature", required = false) String signature)
+                                     @RequestParam(value = "timestamp", required = false) String timestamp,
+                                     @RequestParam(value = "nonce", required = false) String nonce,
+                                     @RequestParam(value = "signature", required = false) String signature)
             throws ApiException, Exception {
         Boolean result = roomService.memberOnlineStatus(statusList, nonce, timestamp, signature);
         return new BaseResponse<>(result);

mec-im/src/main/java/com/ym/dao/RoomMemberDao.java

@@ -62,11 +62,6 @@ public interface RoomMemberDao extends JpaRepository<RoomMember, Long> {
     @Query(value = "update rongyun_room_member set mic=?3 where rid=?1 and uid=?2", nativeQuery = true)
     public int updateMicByRidAndUid(String rid, String uid, boolean mic);
 
-    @Transactional
-    @Modifying
-    @Query(value = "update rongyun_room_member set music_mode=?3 where rid=?1 and uid=?2", nativeQuery = true)
-    public int updateMusicByRidAndUid(String rid, String uid, boolean musicMode);
-
     public boolean existsByRidAndUid(String rid, String uid);
 
     public boolean existsByRidAndRole(String rid, int role);

mec-im/src/main/java/com/ym/pojo/DeviceTypeEnum.java

@@ -6,5 +6,4 @@ package com.ym.pojo;
 public enum DeviceTypeEnum {
     Microphone,
     Camera,
-    MusicMode,
 }

mec-im/src/main/java/com/ym/pojo/ReqDeviceControlData.java

@@ -7,21 +7,11 @@ import lombok.Data;
  */
 @Data
 public class ReqDeviceControlData {
-    private Boolean cameraOn;
-    private Boolean microphoneOn;
-    private Boolean musicModeOn;
-    private String roomId;
-    private String userId;
-    private String ticket;
-
-	public Boolean getMusicModeOn() {
-		return musicModeOn;
-	}
-
-	public void setMusicModeOn(Boolean musicModeOn) {
-		this.musicModeOn = musicModeOn;
-	}
-
+	private Boolean cameraOn;
+	private Boolean microphoneOn;
+	private String roomId;
+	private String userId;
+	private String ticket;
 	public Boolean getCameraOn() {
 		return cameraOn;
 	}
@@ -52,5 +42,5 @@ public class ReqDeviceControlData {
 	public void setTicket(String ticket) {
 		this.ticket = ticket;
 	}
-    
+
 }

mec-im/src/main/java/com/ym/pojo/ReqUserData.java

@@ -7,18 +7,11 @@ import lombok.Data;
  */
 @Data
 public class ReqUserData {
-    private String userName;
-    private String roomId;
-    private String userId;
-    private boolean audience;
+	private String userName;
+	private String roomId;
+	private String userId;
+	private boolean audience;
 	private boolean disableCamera;
-	private boolean musicMode;
-	public boolean isMusicMode() {
-		return musicMode;
-	}
-	public void setMusicMode(boolean musicMode) {
-		this.musicMode = musicMode;
-	}
 	public String getUserName() {
 		return userName;
 	}
@@ -49,5 +42,5 @@ public class ReqUserData {
 	public void setDisableCamera(boolean disableCamera) {
 		this.disableCamera = disableCamera;
 	}
-	
+
 }

mec-im/src/main/java/com/ym/pojo/RoomMember.java

@@ -22,7 +22,6 @@ 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;
 
     public RoomMember() {
@@ -42,7 +41,6 @@ public class RoomMember {
                 ", joinDt=" + joinDt +
                 ", name='" + name + '\'' +
                 ", camera=" + camera +
-                ", musicMode=" + musicMode +
                 ", mic=" + mic +
                 '}';
     }

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

@@ -105,11 +105,11 @@ public class RoomServiceImpl implements RoomService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public RoomResult joinRoom(String userName, String roomId, boolean isAudience, boolean isDisableCamera,boolean isMusicMode) throws ApiException, Exception {
+    public RoomResult joinRoom(String userName, String roomId, boolean isAudience, boolean isDisableCamera) throws ApiException, Exception {
         CheckUtils.checkArgument(userName != null, "userName must't be null");
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 
-        log.info("joinRoom: roomId={}, userName={}, isAudience={}, isDisableCamera={},isMusicMode={}", roomId, userName, isAudience, isDisableCamera,isMusicMode);
+        log.info("joinRoom: roomId={}, userName={}, isAudience={}, isDisableCamera={}", roomId, userName, isAudience, isDisableCamera);
 
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         String userId = sysUser.getId().toString();
@@ -178,7 +178,7 @@ public class RoomServiceImpl implements RoomService {
             }else {
                 roleEnum = RoleEnum.RoleStudent;
             }
-            saveRoomMember(userId, userName, roomId, roleEnum.getValue(), !isDisableCamera,!isMusicMode, curTime);
+            saveRoomMember(userId, userName, roomId, roleEnum.getValue(), !isDisableCamera, curTime);
             IMApiResultInfo resultInfo = imHelper.joinGroup(new String[]{userId}, roomId, roomId);
             if (!resultInfo.isSuccess()) {
                 throw new ApiException(ErrorEnum.ERR_CREATE_ROOM_ERROR, resultInfo.getErrorMessage());
@@ -338,7 +338,7 @@ public class RoomServiceImpl implements RoomService {
         }
     }
 
-    private void saveRoomMember(String userId, String userName, String roomId, int role, boolean cameraOn,boolean musicModeOn, Date joinTime) {
+    private void saveRoomMember(String userId, String userName, String roomId, int role, boolean cameraOn, Date joinTime) {
         RoomMember roomMember = new RoomMember();
         roomMember.setUid(userId);
         roomMember.setName(userName);
@@ -346,7 +346,6 @@ public class RoomServiceImpl implements RoomService {
         roomMember.setRole(role);
         roomMember.setCamera(cameraOn);
         roomMember.setJoinDt(joinTime);
-        roomMember.setMusicMode(musicModeOn);
         roomMemberDao.save(roomMember);
     }
 
@@ -754,23 +753,21 @@ public class RoomServiceImpl implements RoomService {
             taskInfo.setRoomId(roomId);
             taskInfo.setTypeEnum(typeEnum);
             taskInfo.setOnOff(true);
-            taskInfo.setApplyUserId(authUser.getId().toString());
+            taskInfo.setApplyUserId(userId);
             taskInfo.setTargetUserId(userId);
             taskInfo.setTicket(ticket);
             scheduleManager.addTask(taskInfo);
             ControlDeviceNotifyMessage msg = new ControlDeviceNotifyMessage(ActionEnum.Invite.ordinal());
             msg.setTicket(ticket);
             msg.setType(taskInfo.getTypeEnum().ordinal());
-            msg.setOpUserId(authUser.getId().toString());
+            msg.setOpUserId(userId);
             msg.setOpUserName(authUser.getUsername());
-            imHelper.publishMessage(authUser.getId().toString(), userId, roomId, msg);
+            imHelper.publishMessage(userId, userId, roomId, msg);
         } else {
             if (typeEnum.equals(DeviceTypeEnum.Camera)) {
                 roomMemberDao.updateCameraByRidAndUid(roomId, userId, false);
-            } else if (typeEnum.equals(DeviceTypeEnum.Microphone)){
+            } else {
                 roomMemberDao.updateMicByRidAndUid(roomId, userId, false);
-            }else {
-                roomMemberDao.updateMusicByRidAndUid(roomId, userId, false);
             }
             DeviceStateChangedMessage deviceResourceMessage = new DeviceStateChangedMessage(typeEnum.ordinal(), false);
             deviceResourceMessage.setUserId(userId);
@@ -1241,13 +1238,14 @@ public class RoomServiceImpl implements RoomService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
     public boolean statusSync(String roomId,String userId) throws Exception {
         log.info("statusSync: roomId={}, userId={}", roomId, userId);
         List<RoomMember> byRidAndUid = roomMemberDao.findByRidAndUid(roomId, userId);
         if(byRidAndUid.size() > 0){
 //            SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
             SysUser sysUser = teacherDao.getUser(Integer.parseInt(userId));
+            studentDao.lockUser(Integer.parseInt(userId));
             Teacher teacher = teacherDao.get(sysUser.getId());
             CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
             log.info("statusSyncLevelRoom: roomId={}, userId={}", roomId, userId);

mec-im/src/main/java/com/ym/service/RoomService.java

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface RoomService {
     //everyone
-    public RoomResult joinRoom(String userName, String roomId, boolean isAudience, boolean isDisableCamera,boolean isMusicMode) throws ApiException, Exception;
+    public RoomResult joinRoom(String userName, String roomId, boolean isAudience, boolean isDisableCamera) throws ApiException, Exception;
 
     void signIn(Long roomId);