zouxuan преди 5 години
родител
ревизия
e853112a10

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

@@ -147,6 +147,8 @@ public class RoomController{
             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 if (data.getHandUpOn() != null) {
+            result = roomService.controlDevice(data.getRoomId(), data.getUserId(), DeviceTypeEnum.HandUp, data.getHandUpOn());
         } else {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);
         }

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

@@ -64,6 +64,11 @@ public interface RoomMemberDao extends JpaRepository<RoomMember, Long> {
 
     @Transactional
     @Modifying
+    @Query(value = "update rongyun_room_member set mic=?3 where rid=?1 and uid=?2", nativeQuery = true)
+    public int updateHandByRidAndUid(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);
 

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

@@ -7,4 +7,5 @@ public enum DeviceTypeEnum {
     Microphone,
     Camera,
     MusicMode,
+    HandUp,
 }

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

@@ -10,6 +10,7 @@ public class ReqDeviceControlData {
 	private Boolean cameraOn;
 	private Boolean microphoneOn;
 	private Boolean musicModeOn;
+	private Boolean handUpOn;
 	private String roomId;
 	private String userId;
 	private String ticket;
@@ -18,6 +19,14 @@ public class ReqDeviceControlData {
 		return musicModeOn;
 	}
 
+	public Boolean getHandUpOn() {
+		return handUpOn;
+	}
+
+	public void setHandUpOn(Boolean handUpOn) {
+		this.handUpOn = handUpOn;
+	}
+
 	public void setMusicModeOn(Boolean musicModeOn) {
 		this.musicModeOn = musicModeOn;
 	}

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

@@ -24,6 +24,7 @@ public class RoomMember {
     private @Getter @Setter boolean camera = true;
     private @Getter @Setter boolean musicMode = true;
     private @Getter @Setter boolean mic = true;
+    private @Getter @Setter boolean hand = false;
 
     public RoomMember() {
     }

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

@@ -784,6 +784,8 @@ public class RoomServiceImpl implements RoomService {
                 roomMemberDao.updateCameraByRidAndUid(roomId, userId, false);
             } else if (typeEnum.equals(DeviceTypeEnum.Microphone)){
                 roomMemberDao.updateMicByRidAndUid(roomId, userId, false);
+            } else if (typeEnum.equals(DeviceTypeEnum.HandUp)){
+                roomMemberDao.updateHandByRidAndUid(roomId, userId, false);
             }else {
                 roomMemberDao.updateMusicByRidAndUid(roomId, userId, false);
             }