diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java index 06e214ffb..ce5f38806 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java @@ -52,31 +52,6 @@ class SheJiActivity extends AbstractActivity { @Override public void onActivityStart() throws Exception { - Map guildInfoMap = GuilidManager.guildInfoMap; - for(Map.Entry guildInfoEntry:guildInfoMap.entrySet()){ - try { - SimpleTransaction transaction = SimpleTransaction.current(); - GuildInfo guildInfo = guildInfoEntry.getValue(); - Set sendUids = new HashSet<>(); - for (Set items : guildInfo.getMembers().values()) { - sendUids.addAll(items); - } - Lockeys.getLockeys().lock("guild",sendUids); - guildInfo.setGuildSheJiScore(0); - }catch (Exception e){ - LOGGER.error("Exception resetGuildInfo err"); - }finally { - SimpleTransaction.remove(); - MongoUtil.getInstence().lastUpdate(); - } - - } - - //删除本榜单 - String key = RedisUtil.getInstence().getKey(RedisKey.EXPERT_RANK, Integer.toString(id)); - String key2 = RedisUtil.getInstence().getKey(RedisKey.GUILD_SHEJI_SCORE_RANK, Integer.toString(id)); - RedisUtil.getInstence().remove(key); - RedisUtil.getInstence().remove(key2); } @Override @@ -162,6 +137,25 @@ class SheJiActivity extends AbstractActivity { public void onActivityEnd() throws Exception { ThreadManager.getScheduledExecutor().execute(this::sendReward); ThreadManager.getScheduledExecutor().execute(this::sendGuildReward); + Map guildInfoMap = GuilidManager.guildInfoMap; + for(Map.Entry guildInfoEntry:guildInfoMap.entrySet()){ + try { + SimpleTransaction transaction = SimpleTransaction.current(); + GuildInfo guildInfo = guildInfoEntry.getValue(); + Set sendUids = new HashSet<>(); + for (Set items : guildInfo.getMembers().values()) { + sendUids.addAll(items); + } + Lockeys.getLockeys().lock("guild",sendUids); + guildInfo.setGuildSheJiScore(0); + }catch (Exception e){ + LOGGER.error("Exception resetGuildInfo err"); + }finally { + SimpleTransaction.remove(); + MongoUtil.getInstence().lastUpdate(); + } +// + } } protected void sendReward() {