活动：修改获取活动逻辑，从serverlist上剥离

game-server/app/services/redisService.ts

@@ -15,6 +15,7 @@ import { TimeLimitRankData } from '../domain/activityField/timeLimitRankField';
 import { ActivityTimeLimitRankModel } from '../db/ActivityTimeLimitRank';
 import { RoleModel, RoleType } from '../db/Role';
 import { GuildType } from '../db/Guild';
+import { ActivityGroupModel } from '../db/ActivityGroup';
 
 /**
  * 在服务重新启动时，将信息存入redis
@@ -47,9 +48,9 @@ export async function initAllRank() {
 
     await setRankRedisFromDb(REDIS_KEY.PVP_RANK, {});
 
-    for(let {id, activityGroupId} of serverList) {
+    for(let {id} of serverList) {
         await initRank(id);
-        await initActivitiesRank(id, activityGroupId)
+        await initActivitiesRank(id)
     }
 }
 
@@ -74,8 +75,10 @@ export async function initRank(serverId: number) {
     await setRankRedisFromDb(REDIS_KEY.HERO_RANK, { serverId });
 }
 
-export async function initActivitiesRank(serverId: number, activityGroupId: number[]) {
+export async function initActivitiesRank(serverId: number) {
     let serverTime = await getServerCreateTime(serverId);
+    let activityGroup = await ActivityGroupModel.findByServerId(serverId);
+    let activityGroupId = activityGroup.map(cur => cur.groupId);
     let activities = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.TIME_LIMIT_RANK, new Date());
     for(let activity of activities) {
         let data = new TimeLimitRankData(activity, 0, serverTime);