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 c9b1563ba..20fd52e32 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoBase.java @@ -16,13 +16,13 @@ public abstract class MongoBase { private String rootCollection; @Transient - private String id; + private String rootId; @Transient private LjsdMongoTemplate _myMongoTemplate; public void init(String id, LjsdMongoTemplate _myMongoTemplate ,String rootCollection ,String mongoKey, boolean _save) { - this.id = id; + this.rootId = id; this.rootCollection = rootCollection; this._myMongoTemplate = _myMongoTemplate; this.mongoKey = mongoKey; @@ -30,28 +30,28 @@ public abstract class MongoBase { } public void init(String id, LjsdMongoTemplate _myMongoTemplate ,String rootCollection ,String mongoKey) { - this.id = id; + this.rootId = id; this.rootCollection = rootCollection; this._myMongoTemplate = _myMongoTemplate; this.mongoKey = mongoKey; this._save = true; } - public void updateString(MongoBase dataBase, String fieldName, Object value) throws Exception { + public void updateString(MongoBase dataBase, String fieldName, Object value) { - MongoUpdateCacheThreadLocal.addUpdateRequest(this, dataBase.get_myMongoTemplate(), dataBase.getRootCollection(), dataBase.getId(), + MongoUpdateCacheThreadLocal.addUpdateRequest(this, dataBase.get_myMongoTemplate(), dataBase.getRootCollection(), dataBase.getRootId(), mongoKey + "." + fieldName, value); } - public void updateString(String fieldName, MongoBase value) throws Exception { - MongoUpdateCacheThreadLocal.addUpdateRequest(value, value.get_myMongoTemplate(), value.getRootCollection(), value.getId(), + public void updateString(String fieldName, MongoBase value) { + MongoUpdateCacheThreadLocal.addUpdateRequest(value, value.get_myMongoTemplate(), value.getRootCollection(), value.getRootId(), mongoKey + "." + fieldName, value); } public void removeString(String key, MongoBase value) { - MongoUpdateCacheThreadLocal.removeRequest(this, value.get_myMongoTemplate(), value.getRootCollection(), value.getId(), key); + MongoUpdateCacheThreadLocal.removeRequest(this, value.get_myMongoTemplate(), value.getRootCollection(), value.getRootId(), key); } @@ -79,12 +79,12 @@ public abstract class MongoBase { this.rootCollection = rootCollection; } - public String getId() { - return id; + public String getRootId() { + return rootId; } - public void setId(String id) { - this.id = id; + public void setRootId(String rootId) { + this.rootId = rootId; } public LjsdMongoTemplate get_myMongoTemplate() { diff --git a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/BaseInfoForTest.java b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/BaseInfoForTest.java index d6465859c..9e887a142 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/BaseInfoForTest.java +++ b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/BaseInfoForTest.java @@ -17,7 +17,8 @@ public class BaseInfoForTest extends MongoBase { } public void addCard(int cardId,CardTestInfo cardTestInfo) throws Exception { - cardTestInfo.init(getRoot(),getMongoKey() + ".cardTestInfoMap." + cardId); + cardTestInfo.init(cardTestInfo.getRootId(),cardTestInfo.get_myMongoTemplate(),cardTestInfo.getRootCollection(), + getMongoKey() + ".cardTestInfoMap." + cardId); updateString("cardMap." +cardId, cardTestInfo); cardTestInfoMap.put(cardId,cardTestInfo); } @@ -27,7 +28,7 @@ public class BaseInfoForTest extends MongoBase { } public void setName(String name) throws Exception { - updateString("name", name); + updateString(this,"name", name); this.name = name; } @@ -36,7 +37,7 @@ public class BaseInfoForTest extends MongoBase { } public void setAge(int age) throws Exception { - updateString("age", name); + updateString(this,"age", name); this.age = age; } @@ -45,13 +46,16 @@ public class BaseInfoForTest extends MongoBase { } public void setOtherInfoMsg(Map otherInfoMsg) throws Exception { - updateString("otherInfoMsg", name); + updateString(this,"otherInfoMsg", name); this.otherInfoMsg = otherInfoMsg; } public void remove(String id){ - otherInfoMsg.remove(id); - removeString("otherInfoMsg." + id); + String value = otherInfoMsg.get(id); + if (value!=null){ + otherInfoMsg.remove(id); + removeString("otherInfoMsg." + id,this); + } } diff --git a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/CardTestInfo.java b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/CardTestInfo.java index ef1a61ff8..32fe0df66 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/CardTestInfo.java +++ b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/CardTestInfo.java @@ -8,13 +8,13 @@ public class CardTestInfo extends MongoBase { private String level; - public void setId(String id) throws Exception { - updateString("id",id); + public void setId(String id) { + updateString(this,"id",id); this.id = id; } public void setLevel(String level) throws Exception { - updateString("level",level); + updateString(this,"level",level); this.level = level; } diff --git a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/PlayerForTest.java b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/PlayerForTest.java index 6cadd9e27..94f2513ce 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/test/pojo/PlayerForTest.java +++ b/common/src/main/java/com/ljsd/common/mogodb/test/pojo/PlayerForTest.java @@ -18,14 +18,13 @@ public class PlayerForTest extends MongoRoot { public PlayerForTest(int playerId,BaseInfoForTest baseInfoForTest){ setId(String.valueOf(playerId)); this.baseInfoForTest = baseInfoForTest; - baseInfoForTest.init(this,"baseInfoForTest",false); + baseInfoForTest.init(String.valueOf(playerId),_ljsdMongoTemplate,_COLLECTION_NAME,"baseInfoForTest",false); } - public PlayerForTest(){ - setMyMongoDBPool(_ljsdMongoTemplate); - this.baseInfoForTest = new BaseInfoForTest(); - baseInfoForTest.init(this,"baseInfoForTest",false); - } +// public PlayerForTest(){ +// this.baseInfoForTest = new BaseInfoForTest(); +// baseInfoForTest.init(this,"baseInfoForTest",false); +// } public BaseInfoForTest getBaseInfoForTest() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java index 4b4b028ac..3105eed72 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java @@ -33,12 +33,12 @@ public class Cell extends MongoBase { } public void setPointId(int pointId) throws Exception { - updateString("pointId", pointId); + updateString(this,"pointId", pointId); this.pointId = pointId; } public void setEventId(int eventId) throws Exception { - updateString("eventId", eventId); + updateString(this,"eventId", eventId); this.eventId = eventId; } } 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 208ceb065..bfc17de4b 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 @@ -39,7 +39,7 @@ public class MapManager extends MongoBase { } public void updateCrossMapInfos(int key, CrossMapCell crossMapCell) throws Exception { - updateString( "mapInfo." + key, crossMapCell); + updateString(this, "mapInfo." + key, crossMapCell); crossMapInfos.put(key, crossMapCell); } @@ -48,7 +48,7 @@ public class MapManager extends MongoBase { } public void setCurMapId(int curMapId) throws Exception { - updateString("curMapId", curMapId); + updateString(this,"curMapId", curMapId); this.curMapId = curMapId; } @@ -57,23 +57,23 @@ public class MapManager extends MongoBase { } public void setCurXY(int curXY) throws Exception { - updateString("curXY", curXY); + updateString(this,"curXY", curXY); this.curXY = curXY; } public void addOrUpdateCell(int key, Cell cell) throws Exception { - updateString( "mapInfo." + key, cell); + updateString(this,"mapInfo." + key, cell); this.mapInfo.put(key, cell); } public void setMapInfo(Map mapInfo) throws Exception { - updateString( "mapInfo", mapInfo); + updateString(this, "mapInfo", mapInfo); this.mapInfo = mapInfo; } public void removeAllCell() { - removeString("mapInfo"); - this.mapInfo.clear(); +// removeString("mapInfo"); +// this.mapInfo.clear(); } public Map getTypeEight() { @@ -81,7 +81,7 @@ public class MapManager extends MongoBase { } public void setTypeEight(Map typeEight) throws Exception { - updateString( "typeEight", typeEight); + updateString(this, "typeEight", typeEight); this.typeEight = typeEight; } @@ -90,7 +90,7 @@ public class MapManager extends MongoBase { } public void setHeroes(Set heroes) throws Exception { - updateString( "heroes", heroes); + updateString(this, "heroes", heroes); this.heroes = heroes; } @@ -99,12 +99,12 @@ public class MapManager extends MongoBase { } public void setWalkCells(Set walkCells) throws Exception { - updateString( "walkCells", walkCells); + updateString(this, "walkCells", walkCells); this.walkCells = walkCells; } public void addWalkCells(Set walkCells) throws Exception { - updateString( "walkCells", walkCells); + updateString(this, "walkCells", walkCells); if (this.walkCells == null) { this.walkCells = walkCells; } else { @@ -117,7 +117,7 @@ public class MapManager extends MongoBase { } public void setMaxMapId(int maxMapId) throws Exception { - updateString( "maxMapId", maxMapId); + updateString(this, "maxMapId", maxMapId); this.maxMapId = maxMapId; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java index 68a68abbc..87bdcb446 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/Mission.java @@ -50,7 +50,7 @@ public class Mission extends MongoBase { } public void setMissionInfo(String missionInfo) throws Exception { - updateString("missionInfo", missionInfo); + updateString(this,"missionInfo", missionInfo); this.missionInfo = missionInfo; } @@ -59,7 +59,7 @@ public class Mission extends MongoBase { } public void updateMapPoints(int pointId, int eventId) throws Exception { - updateString("mapPoints." + pointId, eventId); + updateString(this,"mapPoints." + pointId, eventId); this.mapPoints.put(pointId, eventId); } } 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 8be3bd542..cccf3e2f8 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 @@ -29,21 +29,21 @@ public class MissionManager extends MongoBase { public void updateDoingMissions(Map doingMissions) throws Exception { this.doingMissions = doingMissions; - updateString( "doingMissions", doingMissions); + updateString(this, "doingMissions", doingMissions); } public void updateOneDoingMissions(int missionId, Mission mission) throws Exception { this.doingMissions.put(missionId, mission); - updateString( "doingMissions." + missionId, mission); + updateString(this, "doingMissions." + missionId, mission); } public void updateFinishMissions(Set finishMissions) throws Exception { this.finishMissions = finishMissions; - updateString( "finishMissions", finishMissions); + updateString(this, "finishMissions", finishMissions); } public void addTakeRewardMissions(int missionId) throws Exception { takeRewardMissions.add(missionId); - updateString( "takeRewardMissions", takeRewardMissions); + updateString(this, "takeRewardMissions", takeRewardMissions); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrementManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrementManager.java index 69b51973a..eeeee18b8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrementManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AutoIncrementManager.java @@ -13,7 +13,7 @@ public class AutoIncrementManager extends MongoBase { } public void addAutoIncrement(AutoIncrement autoIncrement) throws Exception { - autoIncrement.init(autoIncrement.getId(), autoIncrement.get_myMongoTemplate(), autoIncrement.getRootCollection(), + autoIncrement.init(autoIncrement.getRootId(), autoIncrement.get_myMongoTemplate(), autoIncrement.getRootCollection(), getMongoKey() + ".autoIncrementMap." + autoIncrement.getName()); updateString("autoIncrementMap." + autoIncrement.getName(), autoIncrement); autoIncrementMap.put(autoIncrement.getName(),autoIncrement); 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 30bd3894a..21f2cf27a 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 @@ -23,7 +23,7 @@ public class ItemManager extends MongoBase { } public void addItem(Item item) throws Exception { - item.init(item.getId(),item.get_myMongoTemplate(), item.getRootCollection(), getMongoKey() + ".itemMap." + item.getItemId()); + item.init(item.getRootId(),item.get_myMongoTemplate(), item.getRootCollection(), 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/MailingSystemManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystemManager.java index 8c7f0ad08..e6c7fc6af 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystemManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/MailingSystemManager.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.LjsdMongoTemplate; +import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.util.TimeUtils; import org.springframework.context.ConfigurableApplicationContext; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMailManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMailManager.java index 112856fab..587766a01 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMailManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/SysMailManager.java @@ -13,7 +13,7 @@ public class SysMailManager extends MongoBase { } public void addSystemMail(SysMail sysMail) throws Exception { - sysMail.init(sysMail.getId(),sysMail.get_myMongoTemplate(),sysMail.getRootCollection(), getMongoKey() + ".sysMailMap." + sysMail.getRoleUid()); + sysMail.init(sysMail.getRootId(),sysMail.get_myMongoTemplate(),sysMail.getRootCollection(), getMongoKey() + ".sysMailMap." + sysMail.getRoleUid()); updateString("sysMailMap." + sysMail.getRoleUid(), sysMail); sysMailMap.put(sysMail.getRoleUid(),sysMail); } 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 58dffe3a5..482284c28 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 @@ -51,7 +51,7 @@ public class TeamPosManager extends MongoBase { teamPosHeroInfoList.add(teamPosHeroInfo); } teamPosForHero.put(1,teamPosHeroInfoList); - updateString("teamPosForHero",teamPosForHero); + updateString(this,"teamPosForHero",teamPosForHero); } 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 1dabc46ed..f8722b1da 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 @@ -28,7 +28,7 @@ public class WorkShopController extends MongoBase { openBlueStateMap.put(type,new ArrayList<>()); } openBlueStateMap.get(type).add(openId); - updateString("openBlueStateMap." + type, openBlueStateMap.get(type)); + updateString(this,"openBlueStateMap." + type, openBlueStateMap.get(type)); } public void addWorkShopExp(int addExp) throws Exception { @@ -88,7 +88,7 @@ public class WorkShopController extends MongoBase { } public void setWorkShopLevel(int workShopLevel) throws Exception { - updateString("workShopLevel", workShopLevel); + updateString(this,"workShopLevel", workShopLevel); this.workShopLevel = workShopLevel; } @@ -97,17 +97,17 @@ public class WorkShopController extends MongoBase { } public void setWorkShopExp(int workShopExp) throws Exception { - updateString("workShopExp", workShopExp); + updateString(this,"workShopExp", workShopExp); this.workShopExp = workShopExp; } public void setCookLevel(int cookLevel) throws Exception { - updateString("cookLevel", cookLevel); + updateString(this,"cookLevel", cookLevel); this.cookLevel = cookLevel; } public void setCookExp(int cookExp) throws Exception { - updateString("cookExp", cookExp); + updateString(this,"cookExp", cookExp); this.cookExp = cookExp; }