后台：服务器维护

shared/db/Serverlist.ts

@@ -5,11 +5,31 @@ import { COUNTER, SERVER_STATUS } from '../consts';
 import { CreateServerParam } from '../domain/backEndField/params';
 import { RegionType } from './Region';
 import { DicServerName } from '../pubUtils/dictionary/DicServerName';
+import { nowSeconds } from '../pubUtils/timeUtil';
 
+export class Maintenance {
+
+  @prop({ required: true })
+  batchCode: string;       // 批次，如果是从大区列表维护就是一批的，小区列表上就是一服一个
+  
+  @prop({ required: true })
+  isOpen: boolean;       // 维护是否使用
+
+  @prop({ required: true })
+  startTime: number;       // 维护开始时间
+
+  @prop({ required: true })
+  endTime: number;       // 维护结束时间
+
+  @prop({ required: true })
+  hasNotify: boolean;       // 是否有维护通知
+
+}
 /**
   * 游戏字段接口
 */
 @index({ id: 1 })
+@index({ env: 1 })
 @modelOptions({ schemaOptions: { id: false } })
 export default class Serverlist extends BaseModel {
 
@@ -23,7 +43,7 @@ export default class Serverlist extends BaseModel {
   prefix: string;                // 前缀
 
   @prop({ required: true })
-  id: number;                // 小区id 自增
+  id: number;                // 小区id 自增，全大区共用自增counter，玩家role表中存的就是这个serverId
 
   @prop({ required: true })
   serverId: number;              // 相同serverType下的id，不同serverType下id一定不同，但是serverId可能相同
@@ -44,8 +64,7 @@ export default class Serverlist extends BaseModel {
   activityGroupId: number[];  // 活动组
 
   public get status() {
-    let now = new Date();
-    if (now > this.openTime) {
+    if (nowSeconds() > this.openTime) {
       return this.serverStatus;
     } else {
       return SERVER_STATUS.WILL_OPEN; // 未开服
@@ -53,10 +72,10 @@ export default class Serverlist extends BaseModel {
   }
 
   @prop({ required: true })
-  openTime: Date;
+  openTime: number;
 
   @prop({ required: true })
-  stopRegisterTime: Date;
+  stopRegisterTime: number;
 
   @prop({ required: true, default: true })
   canRegister: boolean;
@@ -67,6 +86,9 @@ export default class Serverlist extends BaseModel {
   @prop({ required: true, default: 0 })
   medianCe: number;          // 中位数武将战力、缩小10000倍后的结果
 
+  @prop({ required: true, type: Maintenance, _id: false })
+  maintenance: Maintenance
+
   public static async getAllServerList() {
     let id = await CounterAllModal.getCounter(COUNTER.SERVER);
     let result: ServerlistType[] = [];
@@ -79,7 +101,7 @@ export default class Serverlist extends BaseModel {
   }
 
   public static async findByServerId(serverId: number) {
-    let server: ServerlistType = await ServerlistModel.findOne({ id: serverId }).select('medianCe activityGroupId').lean({ getters: true, virtuals: true });
+    let server: ServerlistType = await ServerlistModel.findOne({ id: serverId }).lean({ getters: true, virtuals: true });
     return server;
   }
 
@@ -89,7 +111,7 @@ export default class Serverlist extends BaseModel {
   }
 
   public static async updateByServerId(serverId: number, update: ServerlistUpdate) {
-    let server: ServerlistType = await ServerlistModel.findOneAndUpdate({ id: serverId }, { $set: update }).lean({ getters: true, virtuals: true });
+    let server: ServerlistType = await ServerlistModel.findOneAndUpdate({ id: serverId }, { $set: update }, {new: true}).lean({ getters: true, virtuals: true });
     return server;
   }
 
@@ -98,19 +120,13 @@ export default class Serverlist extends BaseModel {
     return result;
   }
 
-  public static async updateGroupName(groupId: number, groupName: string) {
-    let server = await ServerlistModel.updateMany({ groupId }, { $set: { groupName } });
-    return server;
-  }
-
   public static async newServer(params: CreateServerParam, region: RegionType, dicServerName: DicServerName, uid = 1 ) {
     let { prefix, id: regionId, env } = region;
     // 分大区
     let id = await CounterAllModal.getNewCounter(COUNTER.SERVER);
-    let { openTime: openTimeNum, stopRegisterTime: hour, activityGroupId } = params;
+    let { openTime, stopRegisterTime: hour, activityGroupId } = params;
     let { id: serverId, sname: name, groupId, groupName } = dicServerName;
-    let openTime = new Date(openTimeNum * 1000);
-    let stopRegisterTime = new Date(openTimeNum + hour * 60 * 60);
+    let stopRegisterTime = openTime + hour * 60 * 60;
 
     const doc = new ServerlistModel();
     const update = Object.assign(doc.toJSON(), { 
@@ -124,49 +140,11 @@ export default class Serverlist extends BaseModel {
     return server;
   }
 
-  public static async findByServerType(serverType?: string) {
-    let condition = {};
-    if(serverType) {
-      condition['serverType'] = serverType;
-    }
-    let server: ServerlistType[] = await ServerlistModel.find(condition).sort({ id: -1 }).lean({ getters: true, virtuals: true });
+  public static async findByEnv(env?: string) {
+    let server: ServerlistType[] = await ServerlistModel.find({ env, serverStatus: { $gt: 0 } }).sort({ id: -1 }).lean({ getters: true, virtuals: true });
     return server;
   }
 
-  private static getSearchObj(form: { id?: number, serverId?: string|number, name?: string, groupName?: string, groupId?: number, serverType?: string }) {
-    let searchObj = {};
-    if (form.id != undefined) searchObj['id'] = form.id;
-    if (form.serverId != undefined) searchObj['serverId'] = form.serverId;
-    if (form.groupId != undefined) searchObj['groupId'] = form.groupId;
-    if (form.name != undefined) searchObj['name'] = { $regex: new RegExp(form.name.toString(), 'i') };
-    if (form.groupName != undefined) searchObj['groupName'] = { $regex: new RegExp(form.groupName.toString(), 'i') };
-    if (form.serverType != undefined) searchObj['serverType'] = form.serverType;
-    return searchObj
-  }
-
-  public static async findByCondition(page: number, pageSize: number, sortField: string, sortOrder: string, form: { id?: number, serverId?: string|number, name?: string, groupName?: string, groupId?: number, serverType?: string } = {}) {
-
-    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: ServerlistType[] = await ServerlistModel.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, serverId?: string|number, name?: string, groupName?: string, groupId?: number, serverType?: string } = {}) {
-
-    let searchObj = this.getSearchObj(form);
-    const result = await ServerlistModel.count(searchObj);
-    return result;
-  }
-
   //根据多个活动id查询活动数据
   public static async findServerByIds(ids: number[]) {
     let result: ServerlistType[] = await ServerlistModel.find({ id: { $in: ids } }).lean();