|
|
@@ -449,9 +449,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
|
|
|
log.info("controlDevice: roomId:{} ,deviceType:{} ,enable:{} ,userId:{}", roomId,deviceControl.getDeviceType(),enable,userId);
|
|
|
|
|
|
UserRoleEnum userRole = UserRoleEnum.TEACHER;
|
|
|
- ClientEnum clientType = ClientEnum.TEACHER;
|
|
|
if (values.length > 1 && ClientEnum.STUDENT.match(values[1])) {
|
|
|
- clientType = ClientEnum.STUDENT;
|
|
|
|
|
|
userRole = UserRoleEnum.STUDENT;
|
|
|
}
|
|
|
@@ -503,7 +501,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
|
|
|
break;
|
|
|
}
|
|
|
}else {
|
|
|
- ImNetworkRoomMember roomMember = Optional.ofNullable(imNetworkRoomMemberService.getDao().findByRidAndUid(roomId, userId, clientType.ordinal()))
|
|
|
+ ImNetworkRoomMember roomMember = Optional.ofNullable(imNetworkRoomMemberService.getDao().findByRidAndUid(roomId, userId, userRole.ordinal()))
|
|
|
.orElseThrow(()-> new BizException("用户不在房间内"));
|
|
|
long scheduleId = Long.parseLong(roomId);
|
|
|
switch (deviceControl.getDeviceType()) {
|
