还原 LogHashMap

back_recharge
jiahuiwen 2022-04-22 17:25:53 +08:00
parent 9a73862291
commit a45d00b522
4 changed files with 35 additions and 17 deletions

View File

@ -1,6 +1,7 @@
package com.ljsd; package com.ljsd;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.db.redis.RedisUtil;
@ -368,7 +369,18 @@ public class CoreService implements RPCRequestIFace.Iface {
} }
Gson gson = RedisUtil.getInstence().getGson(); Gson gson = RedisUtil.getInstence().getGson();
if (user != null) { 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 ""; return "";
} }

View File

@ -1,6 +1,8 @@
package com.ljsd.jieling.jbean; package com.ljsd.jieling.jbean;
import com.ljsd.common.mogodb.MongoBase; 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.HashMap;
import java.util.List; import java.util.List;
@ -8,8 +10,8 @@ import java.util.Map;
public final class ActivityManager extends MongoBase { public final class ActivityManager extends MongoBase {
private HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>(); private HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>();
// @Transient @Transient
// private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityMission, Map<Integer, com.ljsd.jieling.jbean.ActivityMission>> activityMissionMapLog ; private LogHashMap<Integer, ActivityMission, Map<Integer, ActivityMission>> activityMissionMapLog ;
private long senvenStartTime; // 七日狂欢开始时间 private long senvenStartTime; // 七日狂欢开始时间
private com.ljsd.jieling.jbean.LuckWheelMission luckWheel; // 幸运探宝奖池 private com.ljsd.jieling.jbean.LuckWheelMission luckWheel; // 幸运探宝奖池
private com.ljsd.jieling.jbean.LuckWheelMission luckWheelAdvance; // 高级幸运探宝奖池 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() { public Map<Integer, com.ljsd.jieling.jbean.ActivityMission> getActivityMissionMap() {
// if( null == activityMissionMapLog && activityMissionMap != null) if( null == activityMissionMapLog && activityMissionMap != null)
// activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap); activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap);
// return this.activityMissionMapLog; return this.activityMissionMapLog;
return this.activityMissionMap; // return this.activityMissionMap;
} }
public long getSenvenStartTime() { // 七日狂欢开始时间 public long getSenvenStartTime() { // 七日狂欢开始时间

View File

@ -14,8 +14,8 @@ import com.ljsd.common.mogodb.dblog.*;
public final class ActivityMission extends MongoBase { public final class ActivityMission extends MongoBase {
private HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>(); private HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>();
// @Transient @Transient
// private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo, Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>> activityMissionMapLog ; private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo, Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>> activityMissionMapLog ;
private int activityState; private int activityState;
private int openType; private int openType;
private int v; private int v;
@ -40,11 +40,15 @@ public final class ActivityMission extends MongoBase {
} }
public Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> getActivityMissionMap() { public Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> getActivityMissionMap() {
// if( null == activityMissionMapLog && activityMissionMap != null) if( null == activityMissionMapLog && activityMissionMap != null)
// activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap); activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap);
return activityMissionMap; return activityMissionMapLog;
} }
// public void updateActivityMission(int missionId, ActivityProgressInfo activityProgressInfo) {
// updateString("activityMissionMap." + missionId, activityProgressInfo);
// }
public int getActivityState() { public int getActivityState() {
return this.activityState; return this.activityState;
} }

View File

@ -12,8 +12,8 @@ import com.ljsd.common.mogodb.dblog.*;
public final class LuckWheelMission extends MongoBase { public final class LuckWheelMission extends MongoBase {
private HashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo> posInfoMap = new HashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>(); private HashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo> posInfoMap = new HashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>();
// @Transient @Transient
// private LogHashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo, Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>> posInfoMapLog ; private LogHashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo, Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>> posInfoMapLog ;
private int refreshTime; private int refreshTime;
public LuckWheelMission() { public LuckWheelMission() {
@ -27,9 +27,9 @@ public final class LuckWheelMission extends MongoBase {
} }
public Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo> getPosInfoMap() { public Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo> getPosInfoMap() {
// if( null == posInfoMapLog && posInfoMap != null) if( null == posInfoMapLog && posInfoMap != null)
// posInfoMapLog = new LogHashMap( this,"posInfoMap",posInfoMap); posInfoMapLog = new LogHashMap( this,"posInfoMap",posInfoMap);
return posInfoMap; return posInfoMapLog;
} }
public int getRefreshTime() { public int getRefreshTime() {