From be62050c52824274d9dc91cbd9b32e12519296e7 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 17 Jun 2021 02:45:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E6=8F=B4=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/thread/task/MinuteTask.java | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index f65252102..7239a3dc5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -34,6 +34,7 @@ import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; import com.ljsd.jieling.logic.store.StoreLogic; import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.thread.ThreadManager; +import com.ljsd.jieling.util.AyyncWorker; import com.ljsd.jieling.util.MessageUtil; import manager.STableManager; import org.slf4j.Logger; @@ -189,43 +190,43 @@ public class MinuteTask extends Thread { RedisUtil.getInstence().del(RedisKey.getKey(RedisKey.GUILD_RED_PACKAGE_RANK,String.valueOf(guildInfoEntry.getKey()),false)); guildInfoEntry.getValue().reSetFete(); LOGGER.info("{}更新公会祭祀完毕",guildInfoEntry.getValue().getName()); - SimpleTransaction transaction = SimpleTransaction.current(); +// 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); +// Lockeys.getLockeys().lock("guild",sendUids); guildInfo.clearGuildHelpLog(); -// for (Integer sendUid : sendUids) { -// User target = UserManager.getUser(sendUid); -// AyyncWorker ayyncWorker = new AyyncWorker(target, true, user -> { -// GuildLogic.sendGuildHelpRewardEmail(target); -// GuildMyInfo guildMyInfo = target.getGuildMyInfo(); -// guildMyInfo.setGuidHelpInfo(new HashMap<>()); -// guildMyInfo.setGuidHelpHadTakeInfo(new HashMap<>()); -// guildMyInfo.setGuildHelpSendTime(0); -// guildMyInfo.setGuildHelpReward(false); -// guildMyInfo.setGuildHelpTime(0); -// }); -// ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker); -// } - - //统一清除 for (Integer sendUid : sendUids) { User target = UserManager.getUser(sendUid); - LOGGER.info("公会援助刷新uid=>{}",sendUid); - GuildLogic.sendGuildHelpRewardEmail(target); - GuildMyInfo guildMyInfo = target.getGuildMyInfo(); - guildMyInfo.setGuidHelpInfo(new HashMap<>()); - guildMyInfo.setGuidHelpHadTakeInfo(new HashMap<>()); - guildMyInfo.setGuildHelpSendTime(0); - guildMyInfo.setGuildHelpReward(false); - guildMyInfo.setGuildHelpTime(0); + AyyncWorker ayyncWorker = new AyyncWorker(target, true, user -> { + GuildLogic.sendGuildHelpRewardEmail(target); + GuildMyInfo guildMyInfo = target.getGuildMyInfo(); + guildMyInfo.setGuidHelpInfo(new HashMap<>()); + guildMyInfo.setGuidHelpHadTakeInfo(new HashMap<>()); + guildMyInfo.setGuildHelpSendTime(0); + guildMyInfo.setGuildHelpReward(false); + guildMyInfo.setGuildHelpTime(0); + LOGGER.info("公会援助刷新uid=>{}",sendUid); + }); + ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker); } - LOGGER.info("{}更新公会援助完毕",guildInfoEntry.getValue().getName()); +// LOGGER.info("{}更新公会援助完毕",guildInfoEntry.getValue().getName()); - SimpleTransaction.remove(); +// //统一清除 +// for (Integer sendUid : sendUids) { +// User target = UserManager.getUser(sendUid); +// GuildLogic.sendGuildHelpRewardEmail(target); +// GuildMyInfo guildMyInfo = target.getGuildMyInfo(); +// guildMyInfo.setGuidHelpInfo(new HashMap<>()); +// guildMyInfo.setGuidHelpHadTakeInfo(new HashMap<>()); +// guildMyInfo.setGuildHelpSendTime(0); +// guildMyInfo.setGuildHelpReward(false); +// guildMyInfo.setGuildHelpTime(0); +// } + +// SimpleTransaction.remove(); //处理公会援助信息 //入库