From 2c35bf1b38c7c0f09edb8afb0acbb4f35af9a8b7 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 25 Nov 2019 17:11:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/map/MapLogic.java | 15 ++++++++------- .../ljsd/jieling/handler/map/MapManager.java | 5 +---- .../jieling/logic/dao/WorkShopController.java | 5 +---- .../main/java/config/SAccomplishmentConfig.java | 17 +++-------------- .../src/main/java/config/SEquipTalismana.java | 5 +---- .../src/main/java/config/SHeroReturn.java | 8 +------- .../java/config/SMysteryFoodPoolConfig.java | 8 +------- .../src/main/java/config/SRingFireConfig.java | 7 +------ .../src/main/java/config/SRunesPoolConfig.java | 7 +------ .../src/main/java/config/SSevenDaysScore.java | 7 +------ .../java/config/STreasureSunlongTaskConfig.java | 10 ++-------- 11 files changed, 21 insertions(+), 73 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 30963a2c7..874fe79c8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -441,13 +441,14 @@ public class MapLogic { //如果是无尽本 if(initRandomPointMap.get(mapManager.getCurMapId())!=null){ if(initRandomPointMap.get(mapManager.getCurMapId()).get(mapPointConfig.getId())!=null){ - if(endlessRandomPoint.get( mapPointConfig.getId())!=null){ - endlessRandomPoint.get(mapPointConfig.getId()).add(xy); - }else{ - List points = new ArrayList<>(); - points.add(xy); - endlessRandomPoint.put(mapPointConfig.getId(),points); - } +// if(endlessRandomPoint.get( mapPointConfig.getId())!=null){ +// endlessRandomPoint.get(mapPointConfig.getId()).add(xy); +// }else{ +// List points = new ArrayList<>(); +// points.add(xy); +// endlessRandomPoint.put(mapPointConfig.getId(),points); +// } + endlessRandomPoint.computeIfAbsent(mapPointConfig.getId(),v->new ArrayList<>()).add(xy); } }else{ newMap.put(xy, cellValue); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index aa1574495..511bfeabc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -734,10 +734,7 @@ public class MapManager extends MongoBase { if(endlessMapInfo.getMapSign()==null){ endlessMapInfo.setMapSign(new HashMap<>()); } - if(!endlessMapInfo.getMapSign().containsKey(mapId)){ - endlessMapInfo.getMapSign().put(mapId,new HashMap<>()); - } - endlessMapInfo.getMapSign().get(mapId).put(cellId,info); + endlessMapInfo.getMapSign().computeIfAbsent(mapId,v->new HashMap<>()).put(cellId,info); updateString("endlessMapInfo.mapSign."+mapId+"."+cellId,info); } public void removeEndlessSign(int mapId,int cellId){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java index a89c94911..4191d46c5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java @@ -37,10 +37,7 @@ public class WorkShopController extends MongoBase { } public void updateTechLevel(int propession,int techId,int level){ - if(!this.technologyMap.containsKey(propession)){ - this.technologyMap.put(propession,new HashMap<>()); - } - this.technologyMap.get(propession).put(techId,level); + technologyMap.computeIfAbsent(propession,v->new HashMap<>()).put(techId,level); updateString("technologyMap." + propession + "." + techId,level); } diff --git a/tablemanager/src/main/java/config/SAccomplishmentConfig.java b/tablemanager/src/main/java/config/SAccomplishmentConfig.java index af206f729..b67490c48 100644 --- a/tablemanager/src/main/java/config/SAccomplishmentConfig.java +++ b/tablemanager/src/main/java/config/SAccomplishmentConfig.java @@ -36,23 +36,12 @@ public class SAccomplishmentConfig implements BaseConfig { @Override public void init() throws Exception { Map config = STableManager.getConfig(SAccomplishmentConfig.class); - Map> sAccomplishmentConfigByMapIdMapTmp = new HashMap<>(); - Map>> sAccomplishmentConfigByMapIdAndLogicMapTmp = new HashMap<>(); for(SAccomplishmentConfig sAccomplishmentConfig : config.values()){ int mapId = sAccomplishmentConfig.getMapId(); - if(!sAccomplishmentConfigByMapIdMapTmp.containsKey(mapId)){ - sAccomplishmentConfigByMapIdMapTmp.put(mapId,new ArrayList<>()); - sAccomplishmentConfigByMapIdAndLogicMapTmp.put(mapId,new HashMap<>()); - } - int logic = sAccomplishmentConfig.getLogic(); - if(!sAccomplishmentConfigByMapIdAndLogicMapTmp.get(mapId).containsKey(logic)){ - sAccomplishmentConfigByMapIdAndLogicMapTmp.get(mapId).put(logic,new ArrayList<>()); - } - sAccomplishmentConfigByMapIdAndLogicMapTmp.get(mapId).get(logic).add(sAccomplishmentConfig); - sAccomplishmentConfigByMapIdMapTmp.get(mapId).add(sAccomplishmentConfig); + sAccomplishmentConfigByMapIdMap.computeIfAbsent(mapId,v->new ArrayList<>()).add(sAccomplishmentConfig); + sAccomplishmentConfigByMapIdAndLogicMap.computeIfAbsent(mapId,v->new HashMap<>()); + sAccomplishmentConfigByMapIdAndLogicMap.get(mapId).computeIfAbsent(logic,v->new ArrayList<>()).add(sAccomplishmentConfig); } - sAccomplishmentConfigByMapIdMap = sAccomplishmentConfigByMapIdMapTmp; - sAccomplishmentConfigByMapIdAndLogicMap = sAccomplishmentConfigByMapIdAndLogicMapTmp; } public static List getsAccomplishmentConfigByMapIdAndLogic(int mapId,int logic) { diff --git a/tablemanager/src/main/java/config/SEquipTalismana.java b/tablemanager/src/main/java/config/SEquipTalismana.java index 41d3cde16..b859ccc2e 100644 --- a/tablemanager/src/main/java/config/SEquipTalismana.java +++ b/tablemanager/src/main/java/config/SEquipTalismana.java @@ -38,10 +38,7 @@ public class SEquipTalismana implements BaseConfig { equipTalismanaMap = STableManager.getConfig(SEquipTalismana.class); equipTalismanaStarMap = new HashMap<>(); for(Map.Entry entry: equipTalismanaMap.entrySet()){ - if(equipTalismanaStarMap.get(entry.getValue().getTalismanaId())==null){ - equipTalismanaStarMap.put(entry.getValue().getTalismanaId(),new HashMap<>()); - } - equipTalismanaStarMap.get(entry.getValue().getTalismanaId()).put(entry.getValue().getLevel(),entry.getValue()); + equipTalismanaStarMap.computeIfAbsent(entry.getValue().getTalismanaId(),v->new HashMap<>()).put(entry.getValue().getLevel(),entry.getValue()); } } diff --git a/tablemanager/src/main/java/config/SHeroReturn.java b/tablemanager/src/main/java/config/SHeroReturn.java index dad9c9417..83028d61a 100644 --- a/tablemanager/src/main/java/config/SHeroReturn.java +++ b/tablemanager/src/main/java/config/SHeroReturn.java @@ -29,13 +29,8 @@ public class SHeroReturn implements BaseConfig { @Override public void init() throws Exception { Map config = STableManager.getConfig(SHeroReturn.class); - Map> sheroReturnMapTmp = new HashMap<>(); for(SHeroReturn sHeroReturn : config.values()){ int heroId = sHeroReturn.getHeroId(); - if(!sheroReturnMapTmp.containsKey(heroId)){ - sheroReturnMapTmp.put(heroId,new HashMap<>()); - } - Map sHeroReturnMapByStar = sheroReturnMapTmp.get(heroId); int star = sHeroReturn.getStar(); int[] rankupReturn = sHeroReturn.getRankupReturn(); int[][] returnHero = sHeroReturn.getReturnHero(); @@ -48,9 +43,8 @@ public class SHeroReturn implements BaseConfig { returnMaterialsTmp[length-1][0] = rankupReturn[0]; returnMaterialsTmp[length-1][1] = rankupReturn[1]; sHeroReturn.setReturnMaterials(returnMaterialsTmp); - sHeroReturnMapByStar.put(star,sHeroReturn); + sheroReturnMap.computeIfAbsent(heroId,v->new HashMap<>()).put(star,sHeroReturn); } - sheroReturnMap = sheroReturnMapTmp; } diff --git a/tablemanager/src/main/java/config/SMysteryFoodPoolConfig.java b/tablemanager/src/main/java/config/SMysteryFoodPoolConfig.java index 9d05b10bb..81c1879c5 100644 --- a/tablemanager/src/main/java/config/SMysteryFoodPoolConfig.java +++ b/tablemanager/src/main/java/config/SMysteryFoodPoolConfig.java @@ -27,16 +27,10 @@ public class SMysteryFoodPoolConfig implements BaseConfig { @Override public void init() throws Exception { - Map> result = new HashMap<>(); Map config = STableManager.getConfig(SMysteryFoodPoolConfig.class); for(SMysteryFoodPoolConfig sMysteryFoodPoolConfig : config.values()){ - int pool = sMysteryFoodPoolConfig.getPool(); - if(!result.containsKey(pool)){ - result.put(pool,new ArrayList<>()); - } - result.get(pool).add(sMysteryFoodPoolConfig); + sMysteryFoodPoolConfigByPoolMap.computeIfAbsent(pool,v->new ArrayList<>()).add(sMysteryFoodPoolConfig); } - sMysteryFoodPoolConfigByPoolMap = result; } public static List getsMysteryFoodPoolConfigByPoold(int poolId) { diff --git a/tablemanager/src/main/java/config/SRingFireConfig.java b/tablemanager/src/main/java/config/SRingFireConfig.java index c1974a307..e8c284b53 100644 --- a/tablemanager/src/main/java/config/SRingFireConfig.java +++ b/tablemanager/src/main/java/config/SRingFireConfig.java @@ -29,16 +29,11 @@ public class SRingFireConfig implements BaseConfig { @Override public void init() throws Exception { Map config = STableManager.getConfig(SRingFireConfig.class); - Map> sRingFireByRingIdAndLevelMapTmp = new HashMap<>(); for(SRingFireConfig sRingFireConfig : config.values()){ int ringId = sRingFireConfig.getRingId(); int ringLevel = sRingFireConfig.getRingLevel(); - if(!sRingFireByRingIdAndLevelMapTmp.containsKey(ringId)){ - sRingFireByRingIdAndLevelMapTmp.put(ringId,new HashMap<>()); - } - sRingFireByRingIdAndLevelMapTmp.get(ringId).put(ringLevel,sRingFireConfig); + sRingFireByRingIdAndLevelMap.computeIfAbsent(ringId,v->new HashMap<>()).put(ringLevel,sRingFireConfig); } - sRingFireByRingIdAndLevelMap = sRingFireByRingIdAndLevelMapTmp; } public static SRingFireConfig getsRingFireByRingIdAndLevel(int ringId,int ringLevel) { diff --git a/tablemanager/src/main/java/config/SRunesPoolConfig.java b/tablemanager/src/main/java/config/SRunesPoolConfig.java index fd3ab8340..d0898c580 100644 --- a/tablemanager/src/main/java/config/SRunesPoolConfig.java +++ b/tablemanager/src/main/java/config/SRunesPoolConfig.java @@ -28,16 +28,11 @@ public class SRunesPoolConfig implements BaseConfig { @Override public void init() throws Exception { - Map> sRunesPoolConfigsByPoolNumTmp = new HashMap<>(); Map config = STableManager.getConfig(SRunesPoolConfig.class); for(SRunesPoolConfig sRunesPoolConfig : config.values()){ int poolNum = sRunesPoolConfig.getPoolNum(); - if(!sRunesPoolConfigsByPoolNumTmp.containsKey(poolNum)){ - sRunesPoolConfigsByPoolNumTmp.put(poolNum,new ArrayList<>()); - } - sRunesPoolConfigsByPoolNumTmp.get(poolNum).add(sRunesPoolConfig); + sRunesPoolConfigsByPoolNum.computeIfAbsent(poolNum,v->new ArrayList<>()).add(sRunesPoolConfig); } - sRunesPoolConfigsByPoolNum = sRunesPoolConfigsByPoolNumTmp; } public static List getsRunesPoolConfigsByPoolNum(int poolNum) { diff --git a/tablemanager/src/main/java/config/SSevenDaysScore.java b/tablemanager/src/main/java/config/SSevenDaysScore.java index ec8057bc1..7b904a6a3 100644 --- a/tablemanager/src/main/java/config/SSevenDaysScore.java +++ b/tablemanager/src/main/java/config/SSevenDaysScore.java @@ -23,16 +23,11 @@ public class SSevenDaysScore implements BaseConfig { @Override public void init() throws Exception { Map config = STableManager.getConfig(SSevenDaysScore.class); - Map> SSevenDaysScoreByActivityIdAndScoreMapTmp= new HashMap<>(); for(SSevenDaysScore sSevenDaysScore:config.values()){ int activityId = sSevenDaysScore.getActivityId(); int taskValue = sSevenDaysScore.getTaskValue(); - if(!SSevenDaysScoreByActivityIdAndScoreMapTmp.containsKey(activityId)){ - SSevenDaysScoreByActivityIdAndScoreMapTmp.put(activityId,new HashMap<>()); - } - SSevenDaysScoreByActivityIdAndScoreMapTmp.get(activityId).put(taskValue,sSevenDaysScore); + SSevenDaysScoreByActivityIdAndScoreMap.computeIfAbsent(activityId,v->new HashMap<>()).put(taskValue,sSevenDaysScore); } - SSevenDaysScoreByActivityIdAndScoreMap = SSevenDaysScoreByActivityIdAndScoreMapTmp; } diff --git a/tablemanager/src/main/java/config/STreasureSunlongTaskConfig.java b/tablemanager/src/main/java/config/STreasureSunlongTaskConfig.java index c544d00a9..95f39eda3 100644 --- a/tablemanager/src/main/java/config/STreasureSunlongTaskConfig.java +++ b/tablemanager/src/main/java/config/STreasureSunlongTaskConfig.java @@ -37,14 +37,8 @@ public class STreasureSunlongTaskConfig implements BaseConfig { sTreasureTaskConfigListByTypeMapTmp = new HashMap<>(); for(Map.Entry entry:treasureTaskConfig.entrySet()){ STreasureSunlongTaskConfig entryValue = entry.getValue(); - if(!taskTypeMap.containsKey(entryValue.getType())){ - taskTypeMap.put(entryValue.getType(),new ArrayList<>()); - } - if(!sTreasureTaskConfigListByTypeMapTmp.containsKey(entryValue.getTaskType())){ - sTreasureTaskConfigListByTypeMapTmp.put(entryValue.getTaskType(),new ArrayList<>()); - } - sTreasureTaskConfigListByTypeMapTmp.get(entryValue.getTaskType()).add(entryValue); - taskTypeMap.get(entryValue.getType()).add(entry.getKey()); + taskTypeMap.computeIfAbsent(entryValue.getType(),v->new ArrayList<>()).add(entry.getKey()); + sTreasureTaskConfigListByTypeMapTmp.computeIfAbsent(entryValue.getTaskType(),v->new ArrayList<>()).add(entryValue); } }