无用代码注释
parent
99de70fb11
commit
d265432e5a
|
@ -43,48 +43,48 @@ public class GlobalLogic {
|
|||
* 分组
|
||||
*/
|
||||
public void doSplit(){
|
||||
SMServerArenaSetting setting = STableManager.getConfig(SMServerArenaSetting.class).get(1);
|
||||
RedisUtil redisUtil = RedisUtil.getInstence();
|
||||
//这里为所有服务器的世界等级
|
||||
Map<String,Integer> worldLevelMap = redisUtil.getMapValues(RedisKey.SERVER_WORLDLEVE_INFO+":",String.class,Integer.class);
|
||||
Object matched = redisUtil.get(RedisKey.MATCHED_SPLIT_KEY);
|
||||
if(matched!=null){
|
||||
return;
|
||||
}
|
||||
LOGGER.info("Global开始分组");
|
||||
long lastHour = TimeUtils.getLastOrUnderHour(TimeUtils.now(), 1, 0, 0, true);
|
||||
lastHour+=(2*TimeUtils.WEEK);
|
||||
int expireTime =(int)((lastHour-TimeUtils.now())/1000);
|
||||
redisUtil.set(RedisKey.MATCHED_SPLIT_KEY,String.valueOf(1),expireTime-60);
|
||||
//提前两分钟结算
|
||||
redisUtil.set(RedisKey.MATCHED_VERSION,TimeUtils.getTimeStampYMD(System.currentTimeMillis()),expireTime-120);
|
||||
worldLevelMap.forEach((k,v)->redisUtil.zsetAddOne(RedisKey.SERVER_LEVEL_RANK,k,v));
|
||||
Set<ZSetOperations.TypedTuple<String>> zsetRevRangeWithScore = redisUtil.getZsetRevRangeWithScore(RedisKey.SERVER_LEVEL_RANK, setting.getWorldLevel(), 999);
|
||||
// int remain = zsetRevRangeWithScore.size() % 8;
|
||||
int index = 0;
|
||||
int areaId = 1;
|
||||
Map<String,Integer> split = new HashMap<>(zsetRevRangeWithScore.size());
|
||||
for(ZSetOperations.TypedTuple<String> data:zsetRevRangeWithScore){
|
||||
if(index>=setting.getServerNum()){
|
||||
if((zsetRevRangeWithScore.size()-areaId*setting.getServerNum())>setting.getServerNum()/2){
|
||||
areaId++;
|
||||
}
|
||||
index=0;
|
||||
}
|
||||
split.put(data.getValue(),areaId);
|
||||
|
||||
index++;
|
||||
}
|
||||
redisUtil.putMapEntrys(RedisKey.SERVER_SPLIT_INFO,split);
|
||||
LOGGER.info("Global分组结束");
|
||||
splitInfo = RedisUtil.getInstence().getMapValues(RedisKey.SERVER_SPLIT_INFO,String.class,Integer.class);
|
||||
}
|
||||
|
||||
public int getSplitInfo(int serverId){
|
||||
|
||||
if(splitInfo==null){
|
||||
splitInfo = RedisUtil.getInstence().getMapValues(RedisKey.SERVER_SPLIT_INFO,String.class,Integer.class);
|
||||
}
|
||||
return splitInfo.getOrDefault(String.valueOf(serverId),-1);
|
||||
// SMServerArenaSetting setting = STableManager.getConfig(SMServerArenaSetting.class).get(1);
|
||||
// RedisUtil redisUtil = RedisUtil.getInstence();
|
||||
// //这里为所有服务器的世界等级
|
||||
// Map<String,Integer> worldLevelMap = redisUtil.getMapValues(RedisKey.SERVER_WORLDLEVE_INFO+":",String.class,Integer.class);
|
||||
// Object matched = redisUtil.get(RedisKey.MATCHED_SPLIT_KEY);
|
||||
// if(matched!=null){
|
||||
// return;
|
||||
// }
|
||||
// LOGGER.info("Global开始分组");
|
||||
// long lastHour = TimeUtils.getLastOrUnderHour(TimeUtils.now(), 1, 0, 0, true);
|
||||
// lastHour+=(2*TimeUtils.WEEK);
|
||||
// int expireTime =(int)((lastHour-TimeUtils.now())/1000);
|
||||
// redisUtil.set(RedisKey.MATCHED_SPLIT_KEY,String.valueOf(1),expireTime-60);
|
||||
// //提前两分钟结算
|
||||
// redisUtil.set(RedisKey.MATCHED_VERSION,TimeUtils.getTimeStampYMD(System.currentTimeMillis()),expireTime-120);
|
||||
// worldLevelMap.forEach((k,v)->redisUtil.zsetAddOne(RedisKey.SERVER_LEVEL_RANK,k,v));
|
||||
// Set<ZSetOperations.TypedTuple<String>> zsetRevRangeWithScore = redisUtil.getZsetRevRangeWithScore(RedisKey.SERVER_LEVEL_RANK, setting.getWorldLevel(), 999);
|
||||
//// int remain = zsetRevRangeWithScore.size() % 8;
|
||||
// int index = 0;
|
||||
// int areaId = 1;
|
||||
// Map<String,Integer> split = new HashMap<>(zsetRevRangeWithScore.size());
|
||||
// for(ZSetOperations.TypedTuple<String> data:zsetRevRangeWithScore){
|
||||
// if(index>=setting.getServerNum()){
|
||||
// if((zsetRevRangeWithScore.size()-areaId*setting.getServerNum())>setting.getServerNum()/2){
|
||||
// areaId++;
|
||||
// }
|
||||
// index=0;
|
||||
// }
|
||||
// split.put(data.getValue(),areaId);
|
||||
//
|
||||
// index++;
|
||||
// }
|
||||
// redisUtil.putMapEntrys(RedisKey.SERVER_SPLIT_INFO,split);
|
||||
// LOGGER.info("Global分组结束");
|
||||
// splitInfo = RedisUtil.getInstence().getMapValues(RedisKey.SERVER_SPLIT_INFO,String.class,Integer.class);
|
||||
// }
|
||||
//
|
||||
// public int getSplitInfo(int serverId){
|
||||
//
|
||||
// if(splitInfo==null){
|
||||
// splitInfo = RedisUtil.getInstence().getMapValues(RedisKey.SERVER_SPLIT_INFO,String.class,Integer.class);
|
||||
// }
|
||||
// return splitInfo.getOrDefault(String.valueOf(serverId),-1);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue