diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java deleted file mode 100644 index d64b7e2f9..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityManager.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.ljsd.jieling.logic.dao; - -import com.ljsd.common.mogodb.MongoBase; -import com.ljsd.jieling.logic.activity.ActivityType; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -public class ActivityManager extends MongoBase { - private Map activityMissionMap = new HashMap<>(); - private long senvenTime; //七日狂欢结束时间 - private LuckWheelMission luckWheel;//幸运探宝奖池 - private LuckWheelMission luckWheelAdvance;//高级幸运探宝奖池 - - - public boolean initAllActivityMission(int activityId) { - if (activityMissionMap.containsKey(activityId)) { - return false; - } - ActivityMission activityMission = new ActivityMission(); - boolean b = activityMission.initMissionInfo(activityId); - if (!b) { - return false; - } - activityMission.init(getRootId(), getMongoKey() + ".activityMissionMap." + activityId); - activityMissionMap.put(activityId, activityMission); - //开启活动 - updateString("activityMissionMap." + activityId, activityMission); - return true; - } - - public void addActivity(int activityId, ActivityMission activityMission) { - activityMission.init(getRootId(), getMongoKey() + ".activityMissionMap." + activityId); - activityMissionMap.put(activityId, activityMission); - updateString("activityMissionMap." + activityId, activityMission); - } - - public void removeActivity(int activityId) { - activityMissionMap.remove(activityId); - removeString(getMongoKey() + ".activityMissionMap." + activityId); - } - - - public long getSenvenTime() { - return senvenTime; - } - - public void setSenvenTime(long senvenTime) { - updateString("senvenTime", senvenTime); - this.senvenTime = senvenTime; - } - - public Map getActivityMissionMap() { - return activityMissionMap; - } - - public LuckWheelMission getLuckWheel(int type) { - LuckWheelMission luckWheelMission = type == ActivityType.LUCK_WHEEL ? luckWheel : luckWheelAdvance; - if (null == luckWheelMission) { - String key = type == ActivityType.LUCK_WHEEL ? "luckWheel" : "luckWheelAdvance"; - if (type == ActivityType.LUCK_WHEEL) { - luckWheel = luckWheelMission = new LuckWheelMission(); - } else { - luckWheelAdvance = luckWheelMission = new LuckWheelMission(); - } - luckWheelMission.init(getRootId(), getMongoKey() + "." + key); - updateString(key, luckWheelMission); - } - return luckWheelMission; - } - - public void initLuckWheel(int type) { - LuckWheelMission luckWheelMission = type == ActivityType.LUCK_WHEEL ? luckWheel : luckWheelAdvance; - if (null != luckWheelMission) { - String key = type == ActivityType.LUCK_WHEEL ? "luckWheel" : "luckWheelAdvance"; - if (type == ActivityType.LUCK_WHEEL) { - luckWheel = luckWheelMission = new LuckWheelMission(); - } else { - luckWheelAdvance = luckWheelMission = new LuckWheelMission(); - } - luckWheelMission.init(getRootId(), getMongoKey() + "." + key); - updateString(key, luckWheelMission); - } - } - - -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityMission.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityMission.java deleted file mode 100644 index 5800208ba..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityMission.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.ljsd.jieling.logic.dao; - -import com.ljsd.common.mogodb.MongoBase; -import com.ljsd.jieling.logic.activity.ActivityLogic; -import com.ljsd.jieling.logic.activity.ActivityType; -import config.SActivityRewardConfig; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class ActivityMission extends MongoBase { - - private int activityState; - private int openType; - private Map activityProgressInfoMap = new HashMap<>(); - private int value; - - public ActivityMission(){} - - public boolean initMissionInfo(int activityId){ - List sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(activityId); - if(sActivityRewardConfigs == null){return false;} - activityProgressInfoMap = new HashMap<>(sActivityRewardConfigs.size()); - for(SActivityRewardConfig sActivityRewardConfig : sActivityRewardConfigs){ - activityProgressInfoMap.put(sActivityRewardConfig.getId(), new ActivityProgressInfo(ActivityLogic.getInstance().getInitActivityMissionProgress(activityId),0)); - } - openType=1; - if(activityId == 6){ - openType=0; - } - activityState = ActivityType.OPEN_STATE; - value=0; - return true; - } - - public void initOtherMission(List missionIds){ - activityProgressInfoMap = new HashMap<>(missionIds.size()); - for(Integer missionId : missionIds){ - activityProgressInfoMap.put(missionId, new ActivityProgressInfo(0,0)); - } - openType=1; - value=0; - activityState = ActivityType.OPEN_STATE; - } - - public int getActivityState() { - return activityState; - } - - public Map getActivityProgressInfoMap() { - return activityProgressInfoMap; - } - - - - public void updateActivityState(int state){ - activityState = state; - updateString("activityState",state); - } - - public void updateProgressInfo(int missionId, ActivityProgressInfo activityProgressInfo) { - activityProgressInfoMap.put(missionId,activityProgressInfo); - updateString("activityProgressInfoMap." + missionId,activityProgressInfo); - } - - public void setOpenType(int openType) { - updateString("openType" ,openType); - this.openType = openType; - } - - public int getOpenType() { - return openType; - } - - public int getValue() { - return value; - } - - public void setValue(int value) { - updateString("value" ,value); - this.value = value; - } -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityProgressInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityProgressInfo.java deleted file mode 100644 index 56b9ae33b..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityProgressInfo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ljsd.jieling.logic.dao; - -public class ActivityProgressInfo { - private int state; - private int progrss; - - public ActivityProgressInfo() { - } - - public ActivityProgressInfo(int progrss,int state) { - this.progrss = progrss; - this.state = state; - } - - public int getState() { - return state; - } - - public int getProgrss() { - return progrss; - } - - public void setState(int state) { - this.state = state; - } - - public void setProgrss(int progrss) { - this.progrss = progrss; - } -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelMission.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelMission.java deleted file mode 100644 index d90385569..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelMission.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.ljsd.jieling.logic.dao; - -import com.ljsd.common.mogodb.MongoBase; - -import java.util.HashMap; -import java.util.Map; - -/** - * Description: 幸运探宝数据 - * Author: zsx - * CreateDate: 2019/9/24 11:22 - */ -public class LuckWheelMission extends MongoBase { - - private Map posInfoMap = new HashMap<>(); - private int refreshTime; - - - public void setPosInfo(int pos,LuckWheelPosInfo luckWheelPosInfo) { - posInfoMap.put(pos,luckWheelPosInfo); - updateString("posInfoMap." + pos, luckWheelPosInfo); - } - - public void upPosInfo(int pos,LuckWheelPosInfo luckWheelPosInfo) { - posInfoMap.put(pos,luckWheelPosInfo); - updateString("posInfoMap." + pos, luckWheelPosInfo); - } - - public Map getPosInfoMap() { - return posInfoMap; - } - - public int getRefreshTime() { - return refreshTime; - } - - public void setRefreshTime(int refreshTime) { - updateString("refreshTime", refreshTime); - this.refreshTime = refreshTime; - } - - -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelPosInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelPosInfo.java deleted file mode 100644 index 976a21ae5..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LuckWheelPosInfo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ljsd.jieling.logic.dao; - -/** - * Description: 幸运探宝数据 - * Author: zsx - * CreateDate: 2019/9/24 11:22 - */ -public class LuckWheelPosInfo { - private int luckId; - private int progrss; - - public LuckWheelPosInfo() { - } - - public LuckWheelPosInfo(int luckId, int progrss) { - this.luckId = luckId; - this.progrss = progrss; - } - - public int getProgrss() { - return progrss; - } - - public void setProgrss(int progrss) { - this.progrss = progrss; - } - - public void addProgrss() { - this.progrss +=1; - } - - public int getLuckId() { - return luckId; - } - - public void setLuckId(int luckId) { - this.luckId = luckId; - } -}