|
@@ -130,14 +130,38 @@ public class RoomServiceImpl implements RoomService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ public BaseResponse getBaseResponse(String userId, String roomId){
|
|
|
+ RoomResult roomResult = new RoomResult();
|
|
|
+ BaseResponse baseResponse = new BaseResponse(roomResult);
|
|
|
+ RoomResult.MemberResult userResult = new RoomResult.MemberResult();
|
|
|
+ userResult.setUserId(userId);
|
|
|
+ userResult.setRole(3);
|
|
|
+ roomResult.setUserInfo(userResult);
|
|
|
+ roomResult.setRoomId(roomId);
|
|
|
+ RoomResult.MemberResult result = new RoomResult.MemberResult();
|
|
|
+ result.setUserId(userId);
|
|
|
+ result.setRole(3);
|
|
|
+ List<RoomMember> roomMembers = new ArrayList<>();
|
|
|
+ RoomMember roomMember = new RoomMember();
|
|
|
+ roomMember.setRid(roomId);
|
|
|
+ roomMember.setRole(3);
|
|
|
+ roomMember.setUid(userId);
|
|
|
+ roomMembers.add(roomMember);
|
|
|
+ roomResult.setMembers(roomMembers,null);
|
|
|
+ return baseResponse;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
- @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
|
|
|
+ @Transactional(rollbackFor = Exception.class, isolation = Isolation.SERIALIZABLE)
|
|
|
public BaseResponse joinRoom(Long registrationId, String roomId){
|
|
|
StudentExamApiDto examResult = null;
|
|
|
log.info("joinRoom: roomId={}, registrationId={}", roomId,registrationId);
|
|
|
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
String userId = sysUser.getId().toString();
|
|
|
+ if(StringUtils.startsWith(roomId,"S")){
|
|
|
+ return getBaseResponse(userId,roomId);
|
|
|
+ }
|
|
|
String realName = sysUser.getRealName();
|
|
|
if(registrationId != null){
|
|
|
examResult = eduUserFeignService.getExamResult(registrationId);
|