From a45d00b522a8050bcf5441fc1c6cc346c945fc50 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Fri, 22 Apr 2022 17:25:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=20LogHashMap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/CoreService.java | 14 +++++++++++++- .../com/ljsd/jieling/jbean/ActivityManager.java | 14 ++++++++------ .../com/ljsd/jieling/jbean/ActivityMission.java | 14 +++++++++----- .../com/ljsd/jieling/jbean/LuckWheelMission.java | 10 +++++----- 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index f8845c8d2..266e9dbec 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -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 ""; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityManager.java b/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityManager.java index d40a08d9f..f04f1eaff 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityManager.java @@ -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 activityMissionMap = new HashMap(); -// @Transient -// private LogHashMap> activityMissionMapLog ; + @Transient + private LogHashMap> 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 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() { // 七日狂欢开始时间 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityMission.java b/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityMission.java index 384928c09..20a2f01db 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityMission.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityMission.java @@ -14,8 +14,8 @@ import com.ljsd.common.mogodb.dblog.*; public final class ActivityMission extends MongoBase { private HashMap activityMissionMap = new HashMap(); -// @Transient -// private LogHashMap> activityMissionMapLog ; + @Transient + private LogHashMap> activityMissionMapLog ; private int activityState; private int openType; private int v; @@ -40,11 +40,15 @@ public final class ActivityMission extends MongoBase { } public Map 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; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/jbean/LuckWheelMission.java b/serverlogic/src/main/java/com/ljsd/jieling/jbean/LuckWheelMission.java index b3241561d..0649e2620 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/jbean/LuckWheelMission.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/jbean/LuckWheelMission.java @@ -12,8 +12,8 @@ import com.ljsd.common.mogodb.dblog.*; public final class LuckWheelMission extends MongoBase { private HashMap posInfoMap = new HashMap(); -// @Transient -// private LogHashMap> posInfoMapLog ; + @Transient + private LogHashMap> posInfoMapLog ; private int refreshTime; public LuckWheelMission() { @@ -27,9 +27,9 @@ public final class LuckWheelMission extends MongoBase { } public Map 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() {