From 82f9aca0d0f4ae6460aa4da778345b4ee10e6637 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 25 Nov 2020 17:01:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E7=A8=B7=E5=A4=A7=E5=85=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/SheJiActivity.java | 44 ++++++++----------- 1 file changed, 19 insertions(+), 25 deletions(-) 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() {