From db19eacd1647433b37d0f42a272924d178a7359a Mon Sep 17 00:00:00 2001 From: mashiyu Date: Wed, 6 Mar 2019 19:26:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/common/mogodb/MongoBase.java | 2 +- .../java/com/ljsd/common/mogodb/MongoUpdateCache.java | 2 +- .../java/com/ljsd/jieling/handler/map/MapManager.java | 1 - .../com/ljsd/jieling/handler/mission/MissionManager.java | 1 - .../java/com/ljsd/jieling/logic/dao/AdventureManager.java | 1 - .../java/com/ljsd/jieling/logic/dao/EquipManager.java | 1 - .../src/main/java/com/ljsd/jieling/logic/dao/Hero.java | 8 +++++++- .../main/java/com/ljsd/jieling/logic/dao/HeroManager.java | 3 +-- .../main/java/com/ljsd/jieling/logic/dao/ItemManager.java | 3 +-- .../main/java/com/ljsd/jieling/logic/dao/MailManager.java | 1 - .../java/com/ljsd/jieling/logic/dao/PlayerManager.java | 1 - .../java/com/ljsd/jieling/logic/dao/PokemonManager.java | 1 - .../java/com/ljsd/jieling/logic/dao/TeamPosManager.java | 2 +- .../main/java/com/ljsd/jieling/logic/dao/UserManager.java | 2 +- .../com/ljsd/jieling/logic/dao/WorkShopController.java | 1 - 15 files changed, 13 insertions(+), 17 deletions(-) diff --git a/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java b/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java index 6129f8ce8..50fd7afe7 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java @@ -9,7 +9,7 @@ public abstract class MongoBase { private String rootId; - @Transient + private String mongoKey; //该级对应的mongodb的key @Transient private String rootCollection; 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 113e793cd..eee8e1905 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java @@ -43,7 +43,7 @@ public class MongoUpdateCache { } } UpdateRequest request = new UpdateRequest(fullKey, value, opCode, mongoBase); - listRequest.put(fullKey, request); + listRequest.put(fullKey, request); } 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 5f67631b7..9d1a1808b 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 @@ -32,7 +32,6 @@ public class MapManager extends MongoBase { public MapManager() { this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.mapManager); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java index 78c0a8c17..5af9a0958 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/MissionManager.java @@ -20,7 +20,6 @@ public class MissionManager extends MongoBase { public MissionManager(){ this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.missionManager); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java index 61841265f..b11bf9e37 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureManager.java @@ -14,7 +14,6 @@ public class AdventureManager extends MongoBase { public AdventureManager(){ this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.adventureManager); adventureStateInfoMap = new HashMap<>(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java index 8ec2f58d8..e1ac3a216 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java @@ -14,7 +14,6 @@ public class EquipManager extends MongoBase { public EquipManager() { this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.equipManager); this.equipMap = new HashMap<>(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 9f3c54e8a..b8ee1ecfa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -5,6 +5,8 @@ import com.ljsd.jieling.config.SCHero; import com.ljsd.jieling.config.SGameSetting; import com.ljsd.jieling.config.SHeroLevlConfig; import com.ljsd.jieling.core.GlobalsDef; +import com.ljsd.jieling.db.mongo.MongoKey; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.util.KeyGenUtils; @@ -39,10 +41,14 @@ public class Hero extends MongoBase { private float curHp; - public Hero(){} + public Hero(){ + //绑定关系 + this.setRootCollection(User._COLLECTION_NAME); + } public Hero(String uid,int heroTid){ this.id = KeyGenUtils.produceIdByModule(UUIDEnum.HERO,uid); + SCHero scHero = SCHero.getsCHero().get(heroTid); this.templateId = scHero.getId(); this.level = 1; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java index 30639b2dd..d4fc115b6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java @@ -14,7 +14,6 @@ public class HeroManager extends MongoBase { public HeroManager() { heroMap = new HashMap(); this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.heroManager); } public Map getItemMap() { @@ -27,7 +26,7 @@ public class HeroManager extends MongoBase { public void addHero(Hero hero) throws Exception { //绑定关系 - hero.init(hero.getId(),getMongoKey() + ".heroMap." + hero.getId()); + hero.init(this.getRootId(),getMongoKey() + ".heroMap." + hero.getId()); updateString("heroMap." + hero.getId(), hero); heroMap.put(hero.getId(), hero); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java index 9e18afeb8..9b5d8892e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java @@ -13,7 +13,6 @@ public class ItemManager extends MongoBase { public ItemManager() { this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.itemManager); } public Map getItemMap() { @@ -25,7 +24,7 @@ public class ItemManager extends MongoBase { } public void addItem(Item item) throws Exception { - item.init(item.getRootId(), getMongoKey() + ".itemMap." + item.getItemId()); + item.init(this.getRootId(), getMongoKey() + ".itemMap." + item.getItemId()); updateString("itemMap." + item.getItemId(), item); itemMap.put(item.getItemId(), item); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailManager.java index 938319237..07ca1cb25 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailManager.java @@ -13,7 +13,6 @@ public class MailManager extends MongoBase { public MailManager(){ this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.mailManager); } public Map getMailMap() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 012c327ce..364b4ef05 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -35,7 +35,6 @@ public class PlayerManager extends MongoBase { public PlayerManager(){ this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.playerManager); } public String getOpenId() { 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 8ea72860e..77ca1a23c 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 @@ -12,7 +12,6 @@ public class PokemonManager extends MongoBase { public PokemonManager() { this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.pokemonManager); this.pokemonMap = new HashMap<>(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java index de1758904..44cdb0a35 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java @@ -15,7 +15,7 @@ public class TeamPosManager extends MongoBase { public TeamPosManager(){ this.setRootCollection(User._COLLECTION_NAME); - this.setMongoKey(MongoKey.missionManager); + teamNames = new HashMap<>(3); teamPosForHero = new HashMap<>(3); teamPosForPoken = new HashMap<>(3); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 5b998b4bc..b88d5915b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -96,7 +96,7 @@ public class UserManager { public static User getUser(int uid) throws Exception { - User user = userMap.get(uid); + User user = userMap.get(Integer.toString(uid)); if (user != null) { return user; } 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 4dd41f686..f8516155a 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 @@ -23,7 +23,6 @@ public class WorkShopController extends MongoBase { public WorkShopController(){ this.setRootCollection(MailingSystem._COLLECTION_NAME); - this.setMongoKey(MongoKey.workShopController); this.openBlueStateMap = new HashMap<>();