diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java index 919f5aa80..c6f799838 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java @@ -265,7 +265,6 @@ public class RedisKey { public final static String USER_LEVEL_GUILD_INFO = "USER_LEVEL_GUILD_INFO"; //车迟玩法挑战记录 - public final static String GOLD_RANK = "GOLD_RANK";//点金排行 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/ExpertRankHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/ExpertRankHandler.java index c4fa39abb..4a7452696 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/ExpertRankHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/ExpertRankHandler.java @@ -7,6 +7,7 @@ import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.protocols.PlayerInfoProto; import org.springframework.stereotype.Component; +@Deprecated //统一排行榜接口,废弃原来排行榜 @Component public class ExpertRankHandler extends BaseHandler { @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BuyGoldActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BuyGoldActivity.java index aaed54644..a152e3959 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BuyGoldActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/BuyGoldActivity.java @@ -114,11 +114,4 @@ class BuyGoldActivity extends AbstractActivity { ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.PRIVILLEGE_ADD_INDICATION_VALUE, indication.build(), true); } - - @Override - public void update(User user, int count) { - super.update(user, count); - AbstractRank rank = RankContext.getRankEnum(RankEnum.GOLD_RANK.getType()); - rank.addRank(user.getId(),String.valueOf(id),count); - } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java index 80312a1d5..5d3287b02 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java @@ -9,6 +9,9 @@ import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.mail.MailLogic; +import com.ljsd.jieling.logic.rank.RankContext; +import com.ljsd.jieling.logic.rank.RankEnum; +import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.ItemUtil; import util.TimeUtils; @@ -27,8 +30,9 @@ class ExpectRankActivity extends AbstractActivity { void updateProgressWithUser(User user, ActivityMission activityMission, int count) { activityMission.setV(count + activityMission.getV()); if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){ - String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false); - RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), activityMission.getV()); +// String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false); +// RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), activityMission.getV()); + RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV()); } } @@ -83,7 +87,9 @@ class ExpectRankActivity extends AbstractActivity { } } - Set> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.EXPERT_RANK, Integer.toString(id), 0, (maxRank==-1?0:maxRank) - 1); +// Set> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.EXPERT_RANK, Integer.toString(id), 0, (maxRank==-1?0:maxRank) - 1); + AbstractRank expertRank = RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()); + Set> rankInfo = expertRank.getRankByKey(String.valueOf(id), 0, -1); int rank = 1; int nowTime = (int) (TimeUtils.now() / 1000); for (ZSetOperations.TypedTuple item : rankInfo) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java index b8c8af2c3..6a61c51c9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java @@ -29,7 +29,7 @@ public enum RankEnum { DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new),//param1:玩家总伤害 param2:无 param3:无 DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new),//param1:工会总伤害 param2:无 param3:无 GUILD_FORCE_RANK(20,RedisKey.GUILD_FORCE_RANK,GuildForceRank::new),//param1:公会总战力 param2:无 param3:无 - GOLD_RANK(21,RedisKey.GOLD_RANK,GoldRank::new);//param1:点金次数 param2:无 param3:无 + EXPERT_RANK(21,RedisKey.EXPERT_RANK,GoldRank::new);//param1:活动进度 param2:无 param3:无 private int type; private String redisKey; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankLogic.java index f42196e44..281155dc6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankLogic.java @@ -44,6 +44,7 @@ public class RankLogic { public final static RankLogic instance = new RankLogic(); } public void getRank(ISession session, int type, int activityId,MessageTypeProto.MessageType messageType) throws Exception { + LOGGER.info("获取排行榜信息type={},activityId={}",type,activityId); int page = 1; String rkey = ""; if(activityId != 0){