还原 LogHashMap
parent
9a73862291
commit
a45d00b522
|
@ -1,6 +1,7 @@
|
|||
package com.ljsd;
|
||||
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.google.gson.Gson;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
|
@ -368,7 +369,18 @@ public class CoreService implements RPCRequestIFace.Iface {
|
|||
}
|
||||
Gson gson = RedisUtil.getInstence().getGson();
|
||||
if (user != null) {
|
||||
return gson.toJson(user);
|
||||
String userStr = gson.toJson(user);
|
||||
JSONObject jsonObject = JSONObject.parseObject(userStr);
|
||||
// JSONObject activityManager = (JSONObject) jsonObject.get("activityManager");
|
||||
// activityManager.remove("activityMissionMapLog");
|
||||
// jsonObject.put("activityManager", activityManager);
|
||||
jsonObject.remove("activityManager");
|
||||
jsonObject.remove("bloodyInfo");
|
||||
jsonObject.remove("workShopController");
|
||||
jsonObject.remove("itemManager");
|
||||
jsonObject.remove("mailManager");
|
||||
jsonObject.remove("storeManager");
|
||||
return jsonObject.toString();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
package com.ljsd.jieling.jbean;
|
||||
|
||||
import com.ljsd.common.mogodb.MongoBase;
|
||||
import com.ljsd.common.mogodb.dblog.LogHashMap;
|
||||
import org.springframework.data.annotation.Transient;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
@ -8,8 +10,8 @@ import java.util.Map;
|
|||
|
||||
public final class ActivityManager extends MongoBase {
|
||||
private HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>();
|
||||
// @Transient
|
||||
// private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityMission, Map<Integer, com.ljsd.jieling.jbean.ActivityMission>> activityMissionMapLog ;
|
||||
@Transient
|
||||
private LogHashMap<Integer, ActivityMission, Map<Integer, ActivityMission>> activityMissionMapLog ;
|
||||
private long senvenStartTime; // 七日狂欢开始时间
|
||||
private com.ljsd.jieling.jbean.LuckWheelMission luckWheel; // 幸运探宝奖池
|
||||
private com.ljsd.jieling.jbean.LuckWheelMission luckWheelAdvance; // 高级幸运探宝奖池
|
||||
|
@ -31,10 +33,10 @@ public final class ActivityManager extends MongoBase {
|
|||
}
|
||||
|
||||
public Map<Integer, com.ljsd.jieling.jbean.ActivityMission> getActivityMissionMap() {
|
||||
// if( null == activityMissionMapLog && activityMissionMap != null)
|
||||
// activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap);
|
||||
// return this.activityMissionMapLog;
|
||||
return this.activityMissionMap;
|
||||
if( null == activityMissionMapLog && activityMissionMap != null)
|
||||
activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap);
|
||||
return this.activityMissionMapLog;
|
||||
// return this.activityMissionMap;
|
||||
}
|
||||
|
||||
public long getSenvenStartTime() { // 七日狂欢开始时间
|
||||
|
|
|
@ -14,8 +14,8 @@ import com.ljsd.common.mogodb.dblog.*;
|
|||
|
||||
public final class ActivityMission extends MongoBase {
|
||||
private HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>();
|
||||
// @Transient
|
||||
// private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo, Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>> activityMissionMapLog ;
|
||||
@Transient
|
||||
private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo, Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>> activityMissionMapLog ;
|
||||
private int activityState;
|
||||
private int openType;
|
||||
private int v;
|
||||
|
@ -40,11 +40,15 @@ public final class ActivityMission extends MongoBase {
|
|||
}
|
||||
|
||||
public Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> getActivityMissionMap() {
|
||||
// if( null == activityMissionMapLog && activityMissionMap != null)
|
||||
// activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap);
|
||||
return activityMissionMap;
|
||||
if( null == activityMissionMapLog && activityMissionMap != null)
|
||||
activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap);
|
||||
return activityMissionMapLog;
|
||||
}
|
||||
|
||||
// public void updateActivityMission(int missionId, ActivityProgressInfo activityProgressInfo) {
|
||||
// updateString("activityMissionMap." + missionId, activityProgressInfo);
|
||||
// }
|
||||
|
||||
public int getActivityState() {
|
||||
return this.activityState;
|
||||
}
|
||||
|
|
|
@ -12,8 +12,8 @@ import com.ljsd.common.mogodb.dblog.*;
|
|||
|
||||
public final class LuckWheelMission extends MongoBase {
|
||||
private HashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo> posInfoMap = new HashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>();
|
||||
// @Transient
|
||||
// private LogHashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo, Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>> posInfoMapLog ;
|
||||
@Transient
|
||||
private LogHashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo, Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>> posInfoMapLog ;
|
||||
private int refreshTime;
|
||||
|
||||
public LuckWheelMission() {
|
||||
|
@ -27,9 +27,9 @@ public final class LuckWheelMission extends MongoBase {
|
|||
}
|
||||
|
||||
public Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo> getPosInfoMap() {
|
||||
// if( null == posInfoMapLog && posInfoMap != null)
|
||||
// posInfoMapLog = new LogHashMap( this,"posInfoMap",posInfoMap);
|
||||
return posInfoMap;
|
||||
if( null == posInfoMapLog && posInfoMap != null)
|
||||
posInfoMapLog = new LogHashMap( this,"posInfoMap",posInfoMap);
|
||||
return posInfoMapLog;
|
||||
}
|
||||
|
||||
public int getRefreshTime() {
|
||||
|
|
Loading…
Reference in New Issue