|
@@ -579,7 +579,7 @@ public class RoomServiceImpl implements RoomService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Boolean display(String roomId, int type, String uri) throws ApiException, Exception {
|
|
|
|
|
|
+ public Boolean display(String roomId, int type, String uri, String targetUserId) throws ApiException, Exception {
|
|
SysUser authUser = sysUserFeignService.queryUserInfo();
|
|
SysUser authUser = sysUserFeignService.queryUserInfo();
|
|
String userId = authUser.getId().toString();
|
|
String userId = authUser.getId().toString();
|
|
log.info("display in room: {}, type = {}, uri = {}", roomId, type, uri);
|
|
log.info("display in room: {}, type = {}, uri = {}", roomId, type, uri);
|
|
@@ -627,11 +627,16 @@ public class RoomServiceImpl implements RoomService {
|
|
DisplayMessage displayMessage = new DisplayMessage(display);
|
|
DisplayMessage displayMessage = new DisplayMessage(display);
|
|
imHelper.publishMessage(userId, roomId, displayMessage);
|
|
imHelper.publishMessage(userId, roomId, displayMessage);
|
|
log.info("change display to screen: roomId={}, display={}", roomId, display);
|
|
log.info("change display to screen: roomId={}, display={}", roomId, display);
|
|
|
|
+ } else if (displayEnum.equals(DisplayEnum.STUDENT)) {
|
|
|
|
+ display += "?userId=" + targetUserId + "?uri=" + uri;
|
|
|
|
+ roomDao.updateDisplayByRid(roomId, display);
|
|
|
|
+ DisplayMessage displayMessage = new DisplayMessage(display);
|
|
|
|
+ imHelper.publishMessage(targetUserId, roomId, displayMessage);
|
|
|
|
+ log.info("change display to screen: roomId={}, display={}", roomId, display);
|
|
} else {
|
|
} else {
|
|
display += "?userId=" + userId + "?uri=" + uri;
|
|
display += "?userId=" + userId + "?uri=" + uri;
|
|
// CheckUtils.checkArgument(uri != null, "uri must't be null");
|
|
// CheckUtils.checkArgument(uri != null, "uri must't be null");
|
|
// CheckUtils.checkArgument(whiteboardDao.findByRidAndWbid(roomId, uri).size() > 0, "whiteboard not exist");
|
|
// CheckUtils.checkArgument(whiteboardDao.findByRidAndWbid(roomId, uri).size() > 0, "whiteboard not exist");
|
|
-
|
|
|
|
roomDao.updateDisplayByRid(roomId, display);
|
|
roomDao.updateDisplayByRid(roomId, display);
|
|
DisplayMessage displayMessage = new DisplayMessage(display);
|
|
DisplayMessage displayMessage = new DisplayMessage(display);
|
|
imHelper.publishMessage(userId, roomId, displayMessage);
|
|
imHelper.publishMessage(userId, roomId, displayMessage);
|