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

game-server/app/servers/activity/handler/activityHandler.ts

@@ -33,8 +33,7 @@ export class ActivityHandler {
 
         let playerActivityArray = [];
 
-        let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
-        let groups = await ActivityGroupModel.findGroupsData(activityGroupId);
+        let groups = await ActivityGroupModel.findByServerId(serverId);
         let playerGroupArray = [];
         for (let groupData of groups) {
             let playerGroupActivityArray = [];

game-server/app/servers/activity/remote/activityRemote.ts

@@ -7,6 +7,7 @@ import { getServerMainten, setServerMainten, stopServerMainten } from '../../../
 import { taflush } from '../../../services/sdkService';
 import { ActivityInRemote } from '../../../domain/activityField/activityField';
 import { errlogger } from '../../../util/logger';
+import { ActivityGroupModel } from '../../../db/ActivityGroup';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -39,9 +40,9 @@ export class ActivityRemote {
 
     public async loadActivities() {
         try {
-            let servers = await ServerlistModel.findByEnv(this.app.get('env'));
-            for(let { id: serverId, activityGroupId } of servers) {
-                for(let groupId of activityGroupId) {
+            let activityGroup = await ActivityGroupModel.findAllActivityGroup();
+            for(let { groupId, serverIds } of activityGroup) {
+                for(let serverId of serverIds) {
                     if(!this.groupToServer.has(groupId)) {
                         this.groupToServer.set(groupId, []);
                     }