|
@@ -30,6 +30,7 @@ export class RoomController extends BasicController {
|
|
|
sceneNumber: null,
|
|
|
order: 2,
|
|
|
from: null,
|
|
|
+ assistantId: null,
|
|
|
onlineStatus: 0,
|
|
|
voiceStatus: 0,
|
|
|
enableTalk: null,
|
|
@@ -67,15 +68,17 @@ export class RoomController extends BasicController {
|
|
|
let user = this.socket.handshake.query;
|
|
|
this.logger.info("init-user-query:", this.socket.handshake.query);
|
|
|
if (user) {
|
|
|
+ const checkAssistant = Number(user.userId) === Number(user.assistantId) && user.role !== "leader";
|
|
|
this.user = Object.assign({}, user, {
|
|
|
// roomType: user.roomType || "",
|
|
|
+ role: checkAssistant ? "assistant" : user.role,
|
|
|
});
|
|
|
this.user.sig = this.getSig(this.user.userId);
|
|
|
const oneSceneNum = this.user.sceneNumber || this.user.sceneNum;
|
|
|
const { userId, roomId } = this.user;
|
|
|
await this.initParams(userId, roomId, oneSceneNum);
|
|
|
let order;
|
|
|
- switch (user.role) {
|
|
|
+ switch (this.user.role) {
|
|
|
case "leader":
|
|
|
order = 0;
|
|
|
break;
|
|
@@ -89,9 +92,8 @@ export class RoomController extends BasicController {
|
|
|
order = 2;
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
const userObj = { ...this.user, onlineStatus: 1, isConnected: true, order };
|
|
|
-
|
|
|
+ this.logger.info("update-user-info:", userObj);
|
|
|
updateUser(this.userId, userObj);
|
|
|
// this.sysUsers.push(this.user);
|
|
|
// 只有来源于小程序用户信息才记录到redis
|