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

Revert "✨ feat(db): 修改role表数据库操作方式"

Browse Source 
This reverts commit e39af3649288cc5802739cfe862c818fe56e194e.
This commit is contained in:
luying
2023-05-22 19:43:21 +08:00
parent 2d45b2c66c
commit 7bc9e1fe49
79 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/rankService.ts
+21 -21
View File
@@ -1,7 +1,7 @@
import { KeyName, KeyNameParam, RankParam, GuildRankParam, RoleRankInfo, LineupParam, myIdInter, GeneralRankParam, ValueConfig, GuildRankInfo, RoleAndGuildRankInfo, LeagueRankParam, LeagueRankInfo } from "../domain/rank";
import { getInfoKeyByRedisKey, ROLE_SELECT, GUILD_SELECT, REDIS_KEY, HERO_SELECT, COMPOSE_FIELD_TYPE, KEY_TO_COMPOSE_FIELD, getRedisKeyByRankType, COUNTER, RANK_TYPE, PUSH_ROUTE } from "../consts";
import { redisClient, delKeys, saveLadderDefCeByData } from "./redisService";
import Role, { RoleType } from "../db/Role";
import { RoleType, RoleModel } from "../db/Role";
import { GuildType, GuildModel } from "../db/Guild";
import { HeroModel, HeroType, HeroUpdate } from "../db/Hero";
import { PvpDefenseModel } from "../db/PvpDefense";
@@ -285,7 +285,7 @@ export class Rank {
if (infoKey == REDIS_KEY.USER_INFO) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let param = new RankParam(role);
@@ -306,7 +306,7 @@ export class Rank {
await this.setUserInfo(infoKey, { leagueCode }, param);
} else if (infoKey == REDIS_KEY.TOP_LINEUP_INFO) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let { topLineup = [] } = role;
@@ -333,7 +333,7 @@ export class Rank {
}
} else if (infoKey == REDIS_KEY.DUNGEON_LINEUP) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let { dungeonWarId, dungeonHeroes } = role;
@@ -353,7 +353,7 @@ export class Rank {
}
} else if (infoKey == REDIS_KEY.SHOW_LINEUP) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if(!role) return;
}
let { showLineup, topLineup = [] } = role;
@@ -491,7 +491,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(this.infoKey, roleId);
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
}
param = new RoleRankInfo(role);
param.setInfo(0, { roleId }, score, time);
@@ -594,7 +594,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(this.infoKey, roleId);
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
}
param = new RoleRankInfo(role);
param.setInfo(0, { roleId, hid }, score, time);
@@ -622,7 +622,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(extraKey, this.composeFields(extraKey, myId));
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
}
let { topLineup } = role;
@@ -672,7 +672,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(extraKey, this.composeFields(extraKey, myId));
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
}
let { dungeonWarId, dungeonHeroes } = role;
let cur = dungeonHeroes.find(cur => cur.battleId == dungeonWarId);
@@ -698,7 +698,7 @@ export class Rank {
let hasCurUser = await redisClient().hexistsAsync(extraKey, this.composeFields(extraKey, myId));
if (!hasCurUser) {
if (!role) {
role = await Role.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
role = await RoleModel.findByRoleId(myId.roleId, ROLE_SELECT.RANK, true);
}
let { showLineup, topLineup = [] } = role;
@@ -1063,7 +1063,7 @@ async function setRankFirst(rankFirstRec: RankFirstType) {
export async function setRankRedisFromDb(type: string, args?: { serverId?: number, groupId?: number }) {
if (type == REDIS_KEY.TOWER_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('tower', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('tower', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1112,7 +1112,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.TOP_LINEUP_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('topLineup', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('topLineup', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1129,7 +1129,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
// }
} else if (type == REDIS_KEY.HERO_NUM_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('heroNum', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('heroNum', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1137,7 +1137,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.USER_LV) {
let serverId = args.serverId;
let ranks = await Role.getRank('lv', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('lv', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1145,7 +1145,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.SUM_CE_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('ce', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('ce', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1153,7 +1153,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.DUNGEON_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('dungeon', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('dungeon', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1161,7 +1161,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.MAIN_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('main', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('main', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1169,7 +1169,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
}
} else if (type == REDIS_KEY.MAIN_ELITE_RANK) {
let serverId = args.serverId;
let ranks = await Role.getRank('mainElite', serverId, ROLE_SELECT.RANK);
let ranks = await RoleModel.getRank('mainElite', serverId, ROLE_SELECT.RANK);
let r = new Rank(type, { serverId });
r.setIsInit(true);
for (let role of ranks) {
@@ -1213,7 +1213,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
} else if (type == REDIS_KEY.GVG_VESTIGE_MEMBER_ALL) {
let ranks = await GVGVestigeSumRankModel.findRankByGroupId();
for(let { _id: groupKey, arr, roleIds } of ranks) {
let roles = await Role.findByRoleIds(roleIds, ROLE_SELECT.RANK);
let roles = await RoleModel.findByRoleIds(roleIds, ROLE_SELECT.RANK);
let r = new Rank(type, { groupKey, day: getDayKeyInfo() });
r.setIsInit(true);
for(let { roleId, score, updatedAt } of arr) {
@@ -1240,7 +1240,7 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
let ranks = await ActivityMiniGameModel.findRank();
for(let { _id: { activityId, roundIndex }, roleIds, arr } of ranks) {
let r = new Rank(type, { activityId, roundIndex });
let roles = await Role.findByRoleIds(roleIds, ROLE_SELECT.RANK);
let roles = await RoleModel.findByRoleIds(roleIds, ROLE_SELECT.RANK);
for(let { roleId, score, updatedAt } of arr) {
let role = roles.find(cur => cur.roleId == roleId);
if(role) await r.setRankWithRoleInfo(roleId, score, updatedAt.getTime(), role, false);
@@ -1322,7 +1322,7 @@ export async function getRankInHandler(redisKey: REDIS_KEY, type: RANK_TYPE, key
let { ranks, myRank } = await r.getRankListWithMyRank({ roleId, guildCode }, type != RANK_TYPE.LADDER);
if (!myRank) {
let role = await Role.findByRoleId(roleId, ROLE_SELECT.RANK, true);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
if (type == RANK_TYPE.TOP_LINTUP) {
myRank = await r.generMyRankWithRole(roleId, role.topLineupCe, 0, role);
} else if (type == RANK_TYPE.TOP_HERO) {