xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台：活动分组分服

Browse Source
This commit is contained in:
luying
2021-05-28 11:10:32 +08:00
parent eeabf70c7a
commit 8961cdf248
10 changed files with 318 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/consts/constModules/sysConst.ts
+2 -1
View File
@@ -31,7 +31,8 @@ export const COUNTER = {
HID: { name: 'hid', def: 10000 },
EID: { name: 'eid', def: 1 },
ROLE: { name: 'role', def: 1 },
ACTIVITY: { name: 'aid', def: 1 }
ACTIVITY: { name: 'aid', def: 1 },
ACTIVITY_GROUP: { name: 'agid', def: 1 }
};
export const DEFAULT_HEROES = [19, 53, 46, 40, 22, 56, 32, 28, 18];
shared/consts/statusCode.ts
+1
View File
@@ -375,6 +375,7 @@ export const STATUS = {
GM_PVP_DEFENSE_NOT_FOUND: { code: 60012, simStr: '该玩家未保存防守阵' },
GM_PVP_DEFENSE_HERO_NOT_FOUND: { code: 60013, simStr: '该守阵没有该武将' },
GM_JSON_FORMAT_ERR: { code: 60005, simStr: 'json格式错误' },
GM_CAN_NOT_DEL_ACT_GROUP: { code: 60006, simStr: '活动组有指向的服务器或活动，不可删除' },
// 支付相关状态 70000 - 79999
NO_PRODUCT_ID: { code: 70001, simStr: '无效商品' },
NO_PAY_TYPE: { code: 70002, simStr: '无效支付类型' },
shared/db/Activity.ts
+26 -8
View File
@@ -2,6 +2,7 @@ import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { CounterModel } from './Counter';
import { COUNTER } from '../consts';
import { ActivityGroupModel } from './ActivityGroup';
/**
* 活动系统
@@ -51,14 +52,11 @@ export default class Activity extends BaseModel {
}
//新增活动
public static async addActivity(aids: number[], serverId: number, beginTime: Date, endTime: Date, type: number, data: string) {
public static async addActivity(aids: number[], groupId: number, beginTime: Date, endTime: Date, type: number, data: string) {
let result: ActivityModelType[] = [];
for (let activityId of aids) {
if (!activityId) activityId = await CounterModel.getNewCounter(COUNTER.ACTIVITY);
let update = { type, data }
if (serverId != undefined) {
update["serverId"] = serverId;
}
if (beginTime != undefined) {
update["beginTime"] = beginTime;
}
@@ -69,20 +67,28 @@ export default class Activity extends BaseModel {
{ new: true, upsert: true }).lean(true);
result.push(rec);
}
if(groupId != undefined) {
if(groupId == 0) {
let newGroup = await ActivityGroupModel.createGroup();
groupId = newGroup.groupId;
}
await ActivityGroupModel.addActivitiesToGroupData(groupId, aids);
}
return result;
}
//删除活动
public static async deleteActivity(activityId: number) {
let result = await ActivityModel.deleteMany({ activityId });
await ActivityGroupModel.pullByActivityIds([activityId]);
return result;
}
//查询
public static async findByCondition(page: number, pageSize: number, type: number = 0, serverId: number = 0, current: boolean = false, activityId: number = 0) {
public static async findByCondition(page: number, pageSize: number, type: number = 0, groupId: number = 0, current: boolean = false, activityId: number = 0) {
let searchObj = {};
if (type != 0) searchObj['type'] = type;
if (serverId != 0) searchObj['serverId'] = { $in: [0, serverId] };
if (groupId != 0) searchObj['groupId'] = groupId;
if (activityId != 0) searchObj['activityId'] = activityId;
if (current) {
searchObj['beginTime'] = { $lte: new Date };
@@ -93,10 +99,10 @@ export default class Activity extends BaseModel {
}
// 获得活动数量
public static async countByCondition(type: number = 0, serverId: number = 0, current: boolean = false, activityId: number = 0) {
public static async countByCondition(type: number = 0, groupId: number = 0, current: boolean = false, activityId: number = 0) {
let searchObj = {};
if (type != 0) searchObj['type'] = type;
if (serverId != 0) searchObj['serverId'] = { $in: [0, serverId] };
if (groupId != 0) searchObj['groupId'] = groupId;
if (activityId != 0) searchObj['activityId'] = activityId;
if (current) {
searchObj['beginTime'] = { $lte: new Date };
@@ -105,6 +111,18 @@ export default class Activity extends BaseModel {
const result = await ActivityModel.count(searchObj);
return result;
}
//根据多个活动id查询活动数据
public static async findActivityByIds(activityIds: number[]) {
let result: ActivityModelType[] = await ActivityModel.find({ activityId: { $in: activityIds } }).lean();
return result;
}
public static async updateGroupId(activityIds: number[], groupId: number) {
let result = await ActivityModel.updateMany({ activityId: { $in: activityIds } }, { $set: { groupId } });
console.log(result)
return result;
}
}
export const ActivityModel = getModelForClass(Activity);
shared/db/ActivityGroup.ts
+91 -5
View File
@@ -1,5 +1,8 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { CounterModel } from './Counter';
import { COUNTER } from '../consts';
import { ActivityModel } from './Activity';
/**
* 活动合集
@@ -11,31 +14,88 @@ export default class Activity_Group extends BaseModel {
groupId: number; // 组Id
@prop({ required: true })
groupName: string; // 组名
@prop({ required: true })
@prop({ required: true, type: Number })
activities: number[]; // 活动Id
@prop({ required: true })
beginTime: Date; // 里面的activity的最早的时间
@prop({ required: true })
endTime: Date; // 里面的activity的最晚的时间
@prop({ required: true, type: Number })
serverIds: number[]; // 关联服务器列表
//查询组
public static async createGroup() {
let groupId = await CounterModel.getNewCounter(COUNTER.ACTIVITY_GROUP);
let result: ActivityGroupModelType = await ActivityGroupModel.findOneAndUpdate({ groupId }, {
$setOnInsert: { groupName: `活动组${groupId}`, activities: [], serverIds: [] }
}, { new: true, upsert: true }).lean();
return result;
}
//查询组
public static async findGroupData(groupId: number) {
let result: ActivityGroupModelType = await ActivityGroupModel.findOne({ groupId }).lean(true);
let result: ActivityGroupModelType = await ActivityGroupModel.findOne({ groupId }).lean();
return result;
}
//更新名字
public static async updateGroupName(groupId: number, groupName: string) {
let result: ActivityGroupModelType = await ActivityGroupModel.findOneAndUpdate({ groupId },
{ $set: { groupName } }, { upsert: true, new: true }).lean(true);
{ $set: { groupName } }, { new: true }).lean(true);
return result;
}
//更新询组
public static async updateGroupData(groupId: number, activities: number[], beginTime: Date, endTime: Date) {
public static async setActivitiesToGroupData(groupId: number, activities: number[]) {
await this.pullByActivityIds(activities); // 先将原先的删除
let result: ActivityGroupModelType = await ActivityGroupModel.findOneAndUpdate({ groupId },
{ $set: { activities, beginTime, endTime } }, { upsert: true, new: true }).lean(true);
{ $set: { activities } }, { new: true }).lean(true);
await ActivityModel.updateGroupId(activities, groupId);
result = await this.updateTime(result.groupId, result.activities);
return result;
}
//更新询组
public static async addActivitiesToGroupData(groupId: number, activities: number[]) {
await this.pullByActivityIds(activities); // 先将原先的删除
let result: ActivityGroupModelType = await ActivityGroupModel.findOneAndUpdate({ groupId },
{ $addToSet: { activities: { $each: activities } } }, { new: true }).lean(true);
await ActivityModel.updateGroupId(activities, groupId);
result = await this.updateTime(result.groupId, result.activities);
return result;
}
// 根据包含的活动更新开始和结束时间
private static async updateTime(groupId: number, aids: number[]) {
let activities = await ActivityModel.findActivityByIds(aids);
let beginTime = undefined, endTime = undefined;
for(let activity of activities) {
if(!beginTime || activity.beginTime < beginTime) beginTime = activity.beginTime;
if(!endTime || activity.endTime > endTime) endTime = activity.endTime;
}
let result: ActivityGroupModelType = await ActivityGroupModel.findOneAndUpdate({ groupId },
{ $set: { beginTime, endTime } }, { new: true }).lean(true);
return result;
}
// 删除活动id
public static async pullByActivityIds(activities: number[]) {
await ActivityModel.updateGroupId(activities, 0);
let activityGroups = await ActivityGroupModel.find({ activities: { $in: activities } });
for(let { groupId } of activityGroups) {
let result = await ActivityGroupModel.findOneAndUpdate({ groupId }, { $pull: { activities: { $in: activities } } }, { new: true }).lean(true);
await this.updateTime(result.groupId, result.activities);
}
}
//更新服务器
public static async updateServerData(groupId: number, serverIds: number[]) {
let result: ActivityGroupModelType = await ActivityGroupModel.findOneAndUpdate({ groupId },
{ $set: { serverIds } }, { new: true }).lean(true);
return result;
}
@@ -44,6 +104,32 @@ export default class Activity_Group extends BaseModel {
let result = await ActivityGroupModel.deleteMany({ groupId });
return result;
}
//查询
public static async findByCondition(page: number, pageSize: number, serverId: number = 0, current: boolean = false, groupId: number = 0) {
let searchObj = {};
if (serverId != 0) searchObj['serverIds'] = { $elemMatch:{$eq:serverId} };
if (groupId != 0) searchObj['groupId'] = groupId;
if (current) {
searchObj['beginTime'] = { $lte: new Date };
searchObj['endTime'] = { $gte: new Date };
}
const result: ActivityGroupModelType[] = await ActivityGroupModel.find(searchObj, { _id: 0 }).limit(pageSize).skip((page - 1) * pageSize).sort({ updatedAt: -1 }).lean();
return result;
}
// 获得活动数量
public static async countByCondition(serverId: number = 0, current: boolean = false, groupId: number = 0) {
let searchObj = {};
if (serverId != 0) searchObj['serverId'] = { $in: [serverId] };
if (groupId != 0) searchObj['groupId'] = groupId;
if (current) {
searchObj['beginTime'] = { $lte: new Date };
searchObj['endTime'] = { $gte: new Date };
}
const result = await ActivityGroupModel.count(searchObj);
return result;
}
}
export const ActivityGroupModel = getModelForClass(Activity_Group);
shared/db/ActivityPopUpShop.ts
+1 -1
View File
@@ -55,7 +55,7 @@ export default class Activity_Pop_Up_Shop extends BaseModel {
}
//删除活动领取记录
public static async deleteActivity(serverId: number, activityId: number, roleId: string, id: number) {
public static async deleteActivity(_serverId: number, activityId: number, roleId: string, id: number) {
let nowDate = new Date();
await ActivityPopUpShopModel.deleteMany({
roleId, activityId, id,
shared/db/ActivityTreasureHuntShop.ts
+1 -1
View File
@@ -14,7 +14,7 @@ export default class Activity_Treasure_Hunt_Shop extends ActivityShop {
dayIndex: number; // 第几天
//根据活动id查询活动数据
public static async findTreasureData(serverId: number, activityId: number, roleId: string, roundIndex: number, dayIndex: number) {
public static async findTreasureData(_serverId: number, activityId: number, roleId: string, roundIndex: number, dayIndex: number) {
let result: ActivityTreasureHuntShopModelType = await ActivityTreasureHuntShopModel.findOne({ roleId, activityId, roundIndex, dayIndex }).lean(true);
return result;
}
shared/db/Serverlist.ts
+21 -1
View File
@@ -34,7 +34,7 @@ export default class Serverlist extends BaseModel {
@prop({ required: true })
serverStatus: number; // 服务器状态
@prop({ required: true })
@prop({ required: true, type: Number })
activityGroupId: number[]; // 活动组
public get status() {
@@ -84,6 +84,26 @@ export default class Serverlist extends BaseModel {
let server: ServerlistType[] = await ServerlistModel.find({ serverType }).lean({ getters: true, virtuals: true });
return server;
}
//根据多个活动id查询活动数据
public static async findServerByIds(ids: number[]) {
let result: ServerlistType[] = await ServerlistModel.find({ id: { $in: ids } }).lean();
return result;
}
public static async updateActivityGroup(id: string, pushArr: number[], pullArr: number[]) {
console.log(id, pushArr, pullArr)
let update = {};
if(pushArr.length > 0) update['$push'] = { activityGroupId: { $each: pushArr } };
if(pullArr.length > 0) update['$pull'] = { activityGroupId: { $in: pullArr } };
let result: ServerlistType[] = await ServerlistModel.findOneAndUpdate({ _id: id }, update).lean();
return result;
}
public static async pullByGroupId(groupId: number) {
let result = await ServerlistModel.updateMany({ activityGroupId: { $elemMatch: { $eq: groupId } }}, { $pull: { activityGroupId: groupId } }, { new: true }).lean(true);
return result;
}
}
export const ServerlistModel = getModelForClass(Serverlist);