红点：修改推送方式

game-server/app/services/rankService.ts

@@ -1,9 +1,9 @@
-import { KeyName, KeyNameParam, RankParam, GuildRankParam, RoleRankInfo, GuildRankInfo, GuildLeader, LineupParam, myIdInter } from "../domain/rank";
-import { REDIS_RANK_TO_INFO, ROLE_SELECT, GUILD_SELECT, REDIS_KEY, REDIS_RANK_TO_EXTRA, HERO_SELECT, COMPOSE_FIELD_TYPE, KEY_TO_COMPOSE_FIELD, RANK_TYPE } from "../consts";
+import { KeyName, KeyNameParam, RankParam, GuildRankParam, RoleRankInfo, GuildRankInfo, GuildLeader, LineupParam, myIdInter, GeneralRankParamRole, GeneralRankParamBattle } from "../domain/rank";
+import { REDIS_RANK_TO_INFO, ROLE_SELECT, GUILD_SELECT, REDIS_KEY, REDIS_RANK_TO_EXTRA, HERO_SELECT, COMPOSE_FIELD_TYPE, KEY_TO_COMPOSE_FIELD, RANK_TYPE_TO_KEY } from "../consts";
 import { redisClient, setUserInfo } from "./redisService";
 import { RoleType, RoleModel } from "../db/Role";
 import { GuildType, GuildModel } from "../db/Guild";
-import { HeroModel, HeroType } from "../db/Hero";
+import { HeroModel, HeroType, HeroUpdate } from "../db/Hero";
 import { SystemConfigModel } from "../db/SystemConfig";
 import { PvpDefenseModel } from "../db/PvpDefense";
 import { gameData } from "../pubUtils/data";
@@ -793,4 +793,46 @@ export async function setRankRedisFromDb(type: string, args?: {serverId?: number
             }
         }
     }
+}
+
+/**
+ * 获取排行榜总览
+ * @param role 玩家数据
+ * @param serverId 所在服务器
+ */
+export async function getGeneralRank(role: RoleType&{rankReceived: number[]}, serverId: number) {
+    let { rankReceived = []} = role;
+
+    let res = {
+        role: new Array<GeneralRankParamRole>(),
+        battle: new Array<GeneralRankParamBattle>()
+    };
+
+    for(let { id, general } of gameData.rank) {
+        let redisKey = RANK_TYPE_TO_KEY.get(id);
+        if(redisKey) {
+            let received = rankReceived.filter(rewardId => {
+                let dic = gameData.generalRankReward.get(rewardId);
+                return dic && dic.rankId == id;
+            });
+            if(general == 1) {
+                let r = new Rank(redisKey, { serverId }, false, 1);
+                let ranks = <RoleRankInfo[]> await r.getRankByRange();
+                if(ranks.length > 0) {
+                    let param = new GeneralRankParamRole(id, ranks[0]||new RoleRankInfo({}, false), received);
+                    res.role.push(param);
+                }
+            } else if (general = 2) {
+                let r = new Rank(redisKey, { serverId }, false, 1);
+                let ranks = <RoleRankInfo[]> await r.getRankByRange();
+                let hero: HeroUpdate;
+                if(ranks.length > 0) {
+                    hero = await HeroModel.getMyTopHero(ranks[0].roleId, 'hid skins');
+                    let param = new GeneralRankParamBattle(id, ranks[0]||new RoleRankInfo({}, false), hero, received);
+                    res.battle.push(param);
+                }
+            }
+        }
+    }
+    return res;
 }