|
|
@@ -753,16 +753,16 @@ public class RoomServiceImpl implements RoomService {
|
|
|
taskInfo.setRoomId(roomId);
|
|
|
taskInfo.setTypeEnum(typeEnum);
|
|
|
taskInfo.setOnOff(true);
|
|
|
- taskInfo.setApplyUserId(userId);
|
|
|
+ taskInfo.setApplyUserId(authUser.getId().toString());
|
|
|
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(userId);
|
|
|
+ msg.setOpUserId(authUser.getId().toString());
|
|
|
msg.setOpUserName(authUser.getUsername());
|
|
|
- imHelper.publishMessage(userId, userId, roomId, msg);
|
|
|
+ imHelper.publishMessage(authUser.getId().toString(), userId, roomId, msg);
|
|
|
} else {
|
|
|
if (typeEnum.equals(DeviceTypeEnum.Camera)) {
|
|
|
roomMemberDao.updateCameraByRidAndUid(roomId, userId, false);
|
zouxuan