无用代码注释

lvxinran 2021-07-10 01:00:06 +08:00
parent 99de70fb11
commit d265432e5a
1 changed files with 43 additions and 43 deletions

View File

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