后台:添加推送给某人逻辑
This commit is contained in:
@@ -6,6 +6,7 @@ import { resResult } from '../../../pubUtils/util';
|
|||||||
import { STATUS } from '../../../consts/statusCode';
|
import { STATUS } from '../../../consts/statusCode';
|
||||||
import { GMMailModel } from '../../../db/GMMail';
|
import { GMMailModel } from '../../../db/GMMail';
|
||||||
import { setGmMails } from '../../../pubUtils/gmData/gmDataUtil';
|
import { setGmMails } from '../../../pubUtils/gmData/gmDataUtil';
|
||||||
|
import { getRoleOnlineInfo } from '../../../services/redisService';
|
||||||
export default function(app: Application) {
|
export default function(app: Application) {
|
||||||
return new GmHandler(app);
|
return new GmHandler(app);
|
||||||
}
|
}
|
||||||
@@ -48,7 +49,6 @@ export class GmHandler {
|
|||||||
|
|
||||||
|
|
||||||
async pushMessage(msg: { uid: number, serverId: number, eventName: string, message: string }, session: BackendSession) {
|
async pushMessage(msg: { uid: number, serverId: number, eventName: string, message: string }, session: BackendSession) {
|
||||||
let sid = session.get('sid');
|
|
||||||
|
|
||||||
let { uid, serverId, eventName, message } = msg;
|
let { uid, serverId, eventName, message } = msg;
|
||||||
|
|
||||||
@@ -61,22 +61,18 @@ export class GmHandler {
|
|||||||
console.log(uid, serverId)
|
console.log(uid, serverId)
|
||||||
let role = await RoleModel.findByUid(uid, serverId);
|
let role = await RoleModel.findByUid(uid, serverId);
|
||||||
if(!role) return resResult(STATUS.GM_ROLE_NOT_FOUND);
|
if(!role) return resResult(STATUS.GM_ROLE_NOT_FOUND);
|
||||||
let {roleId } = role;
|
let { roleId } = role;
|
||||||
|
|
||||||
let channelService = this.app.get('channelService');
|
let hisOnlineInfo = await getRoleOnlineInfo(role.roleId);
|
||||||
let channel = channelService.getChannel(roleId, true);
|
if(hisOnlineInfo.isOnline) {
|
||||||
let users = channel.getMembers();
|
let sid = hisOnlineInfo.sid;
|
||||||
if (users.indexOf(roleId) === -1) {
|
if (!!sid) {//下发邮件,对应前端红点提示
|
||||||
channel.add(roleId, sid);
|
pinus.app.channelService.pushMessageByUids(eventName, resResult(STATUS.SUCCESS, content), [{uid: roleId, sid}]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let tsid = channel.getMember(roleId)['sid'];
|
|
||||||
channelService.pushMessageByUids(eventName, resResult(STATUS.SUCCESS, content), [{
|
|
||||||
uid: roleId,
|
|
||||||
sid: tsid
|
|
||||||
}]);
|
|
||||||
return resResult(STATUS.SUCCESS, { msg: content });
|
return resResult(STATUS.SUCCESS, { msg: content });
|
||||||
}
|
}
|
||||||
|
|
||||||
//对接gm后台,下发邮件
|
//对接gm后台,下发邮件
|
||||||
async addMail(msg: { endTime: number, serverId: number, sendName: string, content: string, goods, sendRoles:[{roleId: string, status: number}], gmMailType: number, sendTime: number }) {
|
async addMail(msg: { endTime: number, serverId: number, sendName: string, content: string, goods, sendRoles:[{roleId: string, status: number}], gmMailType: number, sendTime: number }) {
|
||||||
let {sendRoles, endTime, content, sendName, gmMailType, sendTime, goods, serverId} = msg;
|
let {sendRoles, endTime, content, sendName, gmMailType, sendTime, goods, serverId} = msg;
|
||||||
|
|||||||
+1
-1
@@ -98,7 +98,7 @@ export default class User extends BaseModel {
|
|||||||
@prop({ required: true, default: 0 })
|
@prop({ required: true, default: 0 })
|
||||||
auth: number;
|
auth: number;
|
||||||
|
|
||||||
public static async createUser(isGuest: boolean, tel: string, token: string, platform: string, pkgName: string, serverType: string, deviceId: string, guestTime?: number) {
|
public static async createUser(isGuest: boolean, tel: string, token: string, platform: string, pkgName: string, serverType: string, deviceId: string, guestTime: number = 0) {
|
||||||
const curTime: Date = new Date();
|
const curTime: Date = new Date();
|
||||||
|
|
||||||
const uid = await CounterModel.getNewCounter(COUNTER.UID);
|
const uid = await CounterModel.getNewCounter(COUNTER.UID);
|
||||||
|
|||||||
Reference in New Issue
Block a user