Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw

back_recharge
zhangshanxue 2020-11-25 20:28:44 +08:00
commit 1c43e235ae
1 changed files with 19 additions and 25 deletions

View File

@ -52,31 +52,6 @@ class SheJiActivity extends AbstractActivity {
@Override
public void onActivityStart() throws Exception {
Map<Integer, GuildInfo> guildInfoMap = GuilidManager.guildInfoMap;
for(Map.Entry<Integer,GuildInfo> guildInfoEntry:guildInfoMap.entrySet()){
try {
SimpleTransaction transaction = SimpleTransaction.current();
GuildInfo guildInfo = guildInfoEntry.getValue();
Set<Integer> sendUids = new HashSet<>();
for (Set<Integer> 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<Integer, GuildInfo> guildInfoMap = GuilidManager.guildInfoMap;
for(Map.Entry<Integer,GuildInfo> guildInfoEntry:guildInfoMap.entrySet()){
try {
SimpleTransaction transaction = SimpleTransaction.current();
GuildInfo guildInfo = guildInfoEntry.getValue();
Set<Integer> sendUids = new HashSet<>();
for (Set<Integer> 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() {