From 9c71683e83d66db784a9a1f32c2e30aef8f78e56 Mon Sep 17 00:00:00 2001 From: mashiyu Date: Wed, 6 Mar 2019 16:14:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=A7=E5=B0=8Fkey?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/common/mogodb/MongoUpdateCache.java | 34 +++++++++---------- .../jieling/logic/dao/PokemonManager.java | 2 +- .../ljsd/jieling/logic/hero/HeroLogic.java | 1 - 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java index cd209a03b..113e793cd 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java @@ -24,25 +24,25 @@ public class MongoUpdateCache { protected void addUpdateRequest(MongoBase mongoBase, String fullKey, Object value, int opCode) { - String key = mongoBase.getRootCollection() + ":" + mongoBase.getRootId(); - Map listRequest = requestMap.get(key); - if (listRequest == null) { - listRequest = new HashMap<>(); - requestMap.put(key, listRequest); - } else { - Iterator> it = listRequest.entrySet().iterator(); - while (it.hasNext()) { - Map.Entry entry = it.next(); - String key1 = entry.getKey(); - if (fullKey.contains(key1)) { - return; - } - if (key1.contains(fullKey)) { - it.remove(); + String key = mongoBase.getRootCollection() + ":" + mongoBase.getRootId(); + Map listRequest = requestMap.get(key); + if (listRequest == null) { + listRequest = new HashMap<>(); + requestMap.put(key, listRequest); + } else { + Iterator> it = listRequest.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry entry = it.next(); + String key1 = entry.getKey(); + if (fullKey.contains(key1)) { + return; + } + if (key1.contains(fullKey)) { + it.remove(); + } } } - } - UpdateRequest request = new UpdateRequest(fullKey, value, opCode, mongoBase); + UpdateRequest request = new UpdateRequest(fullKey, value, opCode, mongoBase); listRequest.put(fullKey, request); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java index 2fc50bbc9..8ea72860e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PokemonManager.java @@ -18,7 +18,7 @@ public class PokemonManager extends MongoBase { } public void addPokemon(Pokemon pokemon) throws Exception { - updateString("pokemonMap." + pokemon.getId(), this); + updateString("pokemonMap." + pokemon.getId(), pokemon); pokemonMap.put(pokemon.getId(),pokemon); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index c458a9bfc..09f84a681 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -716,7 +716,6 @@ public class HeroLogic { pokemonInfoList.add(CBean2Proto.getPokemon(pokemon)); } - HeroInfoProto.GetAllPokemonResponse build = HeroInfoProto.GetAllPokemonResponse.newBuilder().addAllPokemonInfo(pokemonInfoList).build(); MessageUtil.sendMessage(iSession,1,MessageTypeProto.MessageType.GET_ALL_POKEMON_RESPONSE_VALUE,build,true); }