后台:大区列表
This commit is contained in:
@@ -754,4 +754,11 @@ export enum BLOCK_TYPE {
|
||||
NOT = 0,
|
||||
BAN = 1,
|
||||
BLOCK = 2,
|
||||
}
|
||||
|
||||
export enum SERVER_TIMER {
|
||||
FIVE_HALF = 1, // 5:30
|
||||
TEN_HALF = 2, // 10:30
|
||||
FIFTEEN_HALF = 3, // 15:30
|
||||
SEVENTEEN_HALF = 4, // 19:30
|
||||
}
|
||||
@@ -107,6 +107,12 @@ export default class Activity_Group extends BaseModel {
|
||||
return result;
|
||||
}
|
||||
|
||||
//获取所有活动组
|
||||
public static async findAllActivityGroup() {
|
||||
let result: ActivityGroupModelType[] = await ActivityGroupModel.find({}).lean();
|
||||
return result;
|
||||
}
|
||||
|
||||
//删除组
|
||||
public static async deleteGroup(groupId: number) {
|
||||
let result = await ActivityGroupModel.deleteMany({ groupId });
|
||||
|
||||
@@ -2,6 +2,7 @@ import { COUNTER } from './../consts';
|
||||
import { CounterModel } from './Counter';
|
||||
import BaseModel from './BaseModel';
|
||||
import { index, getModelForClass, prop, DocumentType, mongoose, ReturnModelType } from '@typegoose/typegoose';
|
||||
import ServerStategy from './ServerStategy';
|
||||
|
||||
|
||||
/**
|
||||
@@ -31,15 +32,32 @@ export default class Region extends BaseModel {
|
||||
@prop({ required: true })
|
||||
gamePort: number; // 长链接地址
|
||||
|
||||
public static async createNewRegion(params: RegionUpdate) {
|
||||
@prop({ required: true })
|
||||
latestServer: number; // 最新服
|
||||
|
||||
@prop({ required: true })
|
||||
serverCount: number; // 总数
|
||||
|
||||
@prop({ required: true })
|
||||
remark: string; // 备注
|
||||
|
||||
@prop({ required: true, type: () => ServerStategy, _id: false })
|
||||
stategy: ServerStategy; // 策略配置
|
||||
|
||||
public static async createNewRegion(params: RegionUpdate, uid = 1) {
|
||||
let id = await CounterModel.getNewCounter(COUNTER.REGION);
|
||||
|
||||
const rec: RegionType = await RegionModel.findOneAndUpdate({ id }, { $setOnInsert: params }, { new: true, upsert: true }).lean();
|
||||
const rec: RegionType = await RegionModel.findOneAndUpdate({ id }, { $setOnInsert: { ...params, createdBy: uid}, $set: { updatedBy: uid } }, { new: true, upsert: true }).lean();
|
||||
return rec;
|
||||
}
|
||||
|
||||
public static async updateRegion(id: number, params: RegionUpdate, uid = 1) {
|
||||
const rec: RegionType = await RegionModel.findOneAndUpdate({ id }, { $set: { ...params, updatedBy: uid } }, { new: true }).lean();
|
||||
return rec;
|
||||
}
|
||||
|
||||
public static async getAllRegion() {
|
||||
const rec: RegionType[] = await RegionModel.find().select('-_id').lean();
|
||||
const rec: RegionType[] = await RegionModel.find().select('-_id -stategty').lean();
|
||||
return rec;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,91 +1,32 @@
|
||||
import BaseModel from './BaseModel';
|
||||
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
|
||||
import { CounterModel } from './Counter';
|
||||
import { COUNTER } from '../consts';
|
||||
import { prop, DocumentType, } from '@typegoose/typegoose';
|
||||
import GMMail from './GMMail';
|
||||
|
||||
/**
|
||||
* 开服策略
|
||||
*/
|
||||
@index({ id: 1 })
|
||||
export default class ServerStategy {
|
||||
|
||||
export default class ServerStategy extends BaseModel {
|
||||
@prop({ required: true })
|
||||
id: number; // 策略唯一id
|
||||
@prop({ required: true })
|
||||
name: string; // 策略名
|
||||
|
||||
@prop({ required: true, default: false })
|
||||
isDefault: boolean; // 是否是自动开服默认使用的策略
|
||||
@prop({ required: true, default: 0 })
|
||||
maxPlayerCnt: number; // 人数上限
|
||||
|
||||
@prop({ required: true, default: 0, type: Number })
|
||||
timers: number[]; // 开服时间点
|
||||
|
||||
@prop({ required: true, type: Number })
|
||||
activityGroupId: number[]; // 选择活动组
|
||||
@prop({ required: true, type: Number })
|
||||
mails: number[]; // 选择邮件模板
|
||||
@prop({ required: true, type: Number })
|
||||
marquees: number[]; // 选择跑马灯
|
||||
@prop({ required: true, type: Number })
|
||||
notices: number[]; // 选择公告
|
||||
|
||||
public static async findBySId(id: number) {
|
||||
const result: ServerStategyType = await ServerStategyModel.findOne({ id }, { _id: 0 }).lean({ getters: true, virtuals: true });
|
||||
return result;
|
||||
@prop({ required: true, type: GMMail, _id: false })
|
||||
openMail: GMMail;
|
||||
|
||||
}
|
||||
@prop({ required: true, type: GMMail, _id: false })
|
||||
circleMail: GMMail;
|
||||
|
||||
@prop({ required: true, default: 0 })
|
||||
stopRegisterTime: number; // 关闭注册时间
|
||||
|
||||
private static getSearchObj(form: { id?: number, name?: string, isDefault?: boolean }) {
|
||||
let searchObj = {};
|
||||
if (form.id != undefined) searchObj['id'] = form.id;
|
||||
if (form.name != undefined) searchObj['name'] = { $regex: new RegExp(form.name.toString(), 'i') };
|
||||
if (form.isDefault != undefined) searchObj['isDefault'] = form.isDefault;
|
||||
return searchObj
|
||||
}
|
||||
|
||||
public static async findByCondition(page: number, pageSize: number, sortField: string, sortOrder: string, form: { id?: number, name?: string, isDefault?: boolean } = {}) {
|
||||
|
||||
let searchObj = this.getSearchObj(form);
|
||||
let sort = {};
|
||||
if (sortField && sortOrder) {
|
||||
if (sortOrder == 'ascend') {
|
||||
sort[sortField] = 1;
|
||||
} else if (sortOrder == 'descend') {
|
||||
sort[sortField] = -1;
|
||||
}
|
||||
}
|
||||
const result: ServerStategyType[] = await ServerStategyModel.find(searchObj, { _id: 0 }).limit(pageSize).skip((page - 1) * pageSize).sort(sort).lean({ getters: true, virtuals: true });
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
public static async countByCondition(form: { id?: number, name?: string, isDefault?: boolean } = {}) {
|
||||
|
||||
let searchObj = this.getSearchObj(form);
|
||||
const result = await ServerStategyModel.count(searchObj);
|
||||
return result;
|
||||
}
|
||||
|
||||
private static async unsetDefault() {
|
||||
const rec = await ServerStategyModel.updateMany({ isDefault: true }, { $set: { isDefault: false } });
|
||||
return rec;
|
||||
}
|
||||
|
||||
public static async updateServerStategy(values: ServerStategyTypeParam & {id: string|number}, uid = 1) {
|
||||
let id = values.id;
|
||||
if(id == 'new') {
|
||||
id = await CounterModel.getNewCounter(COUNTER.SERVER_STATEGY);
|
||||
}
|
||||
if(values.isDefault) {
|
||||
await this.unsetDefault();
|
||||
}
|
||||
delete values.id;
|
||||
let rec: ServerStategyType = await ServerStategyModel.findOneAndUpdate({ id }, { $set: {...values, updatedBy: uid}, $setOnInsert: { createdBy: uid } },
|
||||
{ new: true, upsert: true }).lean(true);
|
||||
return rec;
|
||||
constructor(stategy: ServerStategyUpdate) {
|
||||
this.maxPlayerCnt = stategy.maxPlayerCnt;
|
||||
this.timers = stategy.timers;
|
||||
this.activityGroupId = stategy.activityGroupId;
|
||||
this.stopRegisterTime = stategy.stopRegisterTime;
|
||||
}
|
||||
}
|
||||
|
||||
export const ServerStategyModel = getModelForClass(ServerStategy);
|
||||
|
||||
export interface ServerStategyType extends Pick<DocumentType<ServerStategy>, keyof ServerStategy> { }
|
||||
export type ServerStategyTypeParam = Partial<ServerStategyType>; // 将所有字段变成可选项
|
||||
export interface ServerStategyType extends Pick<DocumentType<ServerStategy>, keyof ServerStategy> { };
|
||||
export type ServerStategyUpdate = Partial<ServerStategyType>; // 将所有字段变成可选项
|
||||
|
||||
@@ -3,7 +3,6 @@ import { index, getModelForClass, prop, DocumentType, modelOptions, ReturnModelT
|
||||
import { GameModel } from './Game';
|
||||
import { CounterModel } from './Counter';
|
||||
import { COUNTER, SERVER_STATUS } from '../consts';
|
||||
import { ServerStategyTypeParam } from './ServerStategy';
|
||||
import { getServerName, getServerGroupName } from '../pubUtils/data';
|
||||
|
||||
/**
|
||||
@@ -74,7 +73,6 @@ export default class Serverlist extends BaseModel {
|
||||
let id = await CounterModel.getCounter(COUNTER.SERVER);
|
||||
let result: ServerlistType[] = [];
|
||||
let n = Math.ceil(id/1000);
|
||||
console.log('****', id, n)
|
||||
for(let i = 0; i < n; i++) {
|
||||
let servers: ServerlistType[] = await ServerlistModel.find().limit(1000).skip(i * 1000).lean({ getters: true, virtuals: true });
|
||||
result.push(...servers);
|
||||
@@ -107,7 +105,7 @@ export default class Serverlist extends BaseModel {
|
||||
return server;
|
||||
}
|
||||
|
||||
public static async newServer(params: { serverType: string, openTime: Date, name?: string }, stategy: ServerStategyTypeParam, uid = 1 ) {
|
||||
public static async newServer(params: { serverType: string, openTime: Date, name?: string }, stategy: any, uid = 1 ) {
|
||||
let { serverType, name } = params;
|
||||
|
||||
let serverEnvs = await GameModel.getServerEnvList();
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import { GM_MAIL_TYPE, MAIL_TIME_TYPE } from "../../consts";
|
||||
import { GM_MAIL_TYPE, MAIL_TIME_TYPE, SERVER_TIMER } from "../../consts";
|
||||
import { isArray } from 'underscore';
|
||||
import GMMail from "../../db/GMMail";
|
||||
import ServerStategy from "../../db/ServerStategy";
|
||||
|
||||
export class UpdateMailParams {
|
||||
hasGoods: boolean = false; // 是否有道具
|
||||
@@ -62,4 +64,41 @@ export class UpdateMailParams {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
export class UpdateRegionParams {
|
||||
id: number|'new' = 0; // 大区id
|
||||
name: string = ''; // 大区名
|
||||
prefix: string = ''; // 区名前缀
|
||||
remark: string = '';
|
||||
|
||||
maxPlayerCnt: number = 0;
|
||||
timers: SERVER_TIMER[] = [];
|
||||
activityGroupId: number[] = [];
|
||||
openMail?: GMMail;
|
||||
circleMail?: GMMail;
|
||||
stopRegisterTime: number = 0;
|
||||
|
||||
constructor(obj: UpdateRegionParams) {
|
||||
for(let key in obj) {
|
||||
this[key] = obj[key];
|
||||
}
|
||||
}
|
||||
|
||||
checkParams() {
|
||||
if(!this.id || !this.name || !this.prefix || !this.maxPlayerCnt || !isArray(this.timers) || this.timers.length <= 0 || !isArray(this.activityGroupId) || this.activityGroupId.length <= 0 ) {
|
||||
return false
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
getUpdateParam() {
|
||||
let stategy = new ServerStategy(this);
|
||||
return {
|
||||
name: this.name,
|
||||
prefix: this.prefix,
|
||||
remark: this.remark,
|
||||
stategy
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user