5点改0点修改
parent
d2c1b418a9
commit
25b2245f5c
|
@ -1,23 +0,0 @@
|
||||||
package com.ljsd.jieling.handler;
|
|
||||||
|
|
||||||
import com.ljsd.jieling.logic.GlobalDataManaager;
|
|
||||||
import com.ljsd.jieling.logic.dao.UserManager;
|
|
||||||
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
|
||||||
import rpc.protocols.MessageTypeProto;
|
|
||||||
import rpc.protocols.PlayerInfoProto;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
public class ServerFiveHandler extends BaseHandler{
|
|
||||||
@Override
|
|
||||||
public MessageTypeProto.MessageType getMessageCode() {
|
|
||||||
return MessageTypeProto.MessageType.SERVER_FIVE_REQEUST;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void process(ISession iSession, PacketNetData netData) throws Exception {
|
|
||||||
GlobalDataManaager.checkNeedReFlush(iSession, UserManager.getUser(iSession.getUid()), PlayerInfoProto.FivePlayerUpdateIndication.newBuilder());
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -25,7 +25,7 @@ public class ServerZeroHandler extends BaseHandler {
|
||||||
GlobalDataManaager.flushGoodsTimes(user);
|
GlobalDataManaager.flushGoodsTimes(user);
|
||||||
PlayerLogic.getInstance().sendDayilyMail(user,-1);
|
PlayerLogic.getInstance().sendDayilyMail(user,-1);
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.LOGIN_GAME,0);
|
user.getUserMissionManager().onGameEvent(user, GameEvent.LOGIN_GAME,0);
|
||||||
|
GlobalDataManaager.checkNeedReFlush(session, UserManager.getUser(session.getUid()), PlayerInfoProto.FivePlayerUpdateIndication.newBuilder());
|
||||||
|
|
||||||
// int indicationIndex = session.getIndicationIndex();
|
// int indicationIndex = session.getIndicationIndex();
|
||||||
// byte[] byteBuf = MessageUtil.wrappedBuffer(session.getUid(), session.getToken(), indicationIndex,1, MessageTypeProto.MessageType.ZeroPlayerUpdateIndication_VALUE, PlayerInfoProto.ZeroPlayerUpdateIndication.newBuilder().build());
|
// byte[] byteBuf = MessageUtil.wrappedBuffer(session.getUid(), session.getToken(), indicationIndex,1, MessageTypeProto.MessageType.ZeroPlayerUpdateIndication_VALUE, PlayerInfoProto.ZeroPlayerUpdateIndication.newBuilder().build());
|
||||||
|
|
|
@ -331,7 +331,7 @@ public class GlobalDataManaager implements IManager {
|
||||||
|
|
||||||
public static void checkNeedReFlush(ISession session,User user,PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception {
|
public static void checkNeedReFlush(ISession session,User user,PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception {
|
||||||
// 需要隔天刷新的字段统一在这里处理
|
// 需要隔天刷新的字段统一在这里处理
|
||||||
if (TimeUtils.isOverTime(5,user.getPlayerInfoManager().getLoginTime())) {
|
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
|
||||||
//活动刷新
|
//活动刷新
|
||||||
ActivityLogic.getInstance().flushEveryDay(user,fBuilder);
|
ActivityLogic.getInstance().flushEveryDay(user,fBuilder);
|
||||||
PlayerLogic.getInstance().vipflushEveryDay(user,fBuilder);
|
PlayerLogic.getInstance().vipflushEveryDay(user,fBuilder);
|
||||||
|
@ -345,7 +345,7 @@ public class GlobalDataManaager implements IManager {
|
||||||
PlayerLogic.getInstance().sendTimingMail(user);
|
PlayerLogic.getInstance().sendTimingMail(user);
|
||||||
user.getGuildMyInfo().setLastHurt(0);
|
user.getGuildMyInfo().setLastHurt(0);
|
||||||
// GuildChallengeLogic.getInstance().resetBossDamage(user);
|
// GuildChallengeLogic.getInstance().resetBossDamage(user);
|
||||||
if(TimeUtils.isSpanTime(user.getPlayerInfoManager().getLoginTime(),TimeUtils.now(),1,5)){
|
if(TimeUtils.isSpanTime(user.getPlayerInfoManager().getLoginTime(),TimeUtils.now(),1,0)){
|
||||||
user.getPlayerInfoManager().updateSituationPass(new HashMap<>());
|
user.getPlayerInfoManager().updateSituationPass(new HashMap<>());
|
||||||
}
|
}
|
||||||
if(fBuilder!=null){
|
if(fBuilder!=null){
|
||||||
|
@ -450,9 +450,6 @@ public class GlobalDataManaager implements IManager {
|
||||||
case 0:
|
case 0:
|
||||||
number = MessageTypeProto.MessageType.SERVER_ZERO_REQUEST_VALUE;
|
number = MessageTypeProto.MessageType.SERVER_ZERO_REQUEST_VALUE;
|
||||||
break;
|
break;
|
||||||
case 5:
|
|
||||||
number = MessageTypeProto.MessageType.SERVER_FIVE_REQEUST_VALUE;
|
|
||||||
break;
|
|
||||||
default:{
|
default:{
|
||||||
LOGGER.info("everTask wrong case=>{}", hour);
|
LOGGER.info("everTask wrong case=>{}", hour);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -69,7 +69,7 @@ public class SituationLogic {
|
||||||
overTime = new int[4];
|
overTime = new int[4];
|
||||||
doCheck();
|
doCheck();
|
||||||
}else{
|
}else{
|
||||||
if(TimeUtils.getHourOfDay()!=5){
|
if(TimeUtils.getHourOfDay()!=0){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
doCheck();
|
doCheck();
|
||||||
|
@ -82,9 +82,6 @@ public class SituationLogic {
|
||||||
long now = TimeUtils.now();
|
long now = TimeUtils.now();
|
||||||
int hourOfDay = TimeUtils.getHourOfDay();
|
int hourOfDay = TimeUtils.getHourOfDay();
|
||||||
int week = TimeUtils.getDayOfWeek();
|
int week = TimeUtils.getDayOfWeek();
|
||||||
if(hourOfDay<5){
|
|
||||||
week = week==1?7:week-1;
|
|
||||||
}
|
|
||||||
boolean isIndication = false;
|
boolean isIndication = false;
|
||||||
for(int[] config:openConfig){
|
for(int[] config:openConfig){
|
||||||
boolean isOpen = false;
|
boolean isOpen = false;
|
||||||
|
@ -98,12 +95,12 @@ public class SituationLogic {
|
||||||
isIndication = true;
|
isIndication = true;
|
||||||
}
|
}
|
||||||
status[config[0]-1] = isOpen?1:0;
|
status[config[0]-1] = isOpen?1:0;
|
||||||
overTime[config[0]-1] =isOpen?(int)(TimeUtils.getLastOrUnderHour(now,5,0,false)/1000):0;
|
overTime[config[0]-1] =isOpen?(int)(TimeUtils.getLastOrUnderHour(now,0,0,false)/1000):0;
|
||||||
}
|
}
|
||||||
if(isIndication){
|
if(isIndication){
|
||||||
//周一刷新
|
//周一刷新
|
||||||
boolean remove = false;
|
boolean remove = false;
|
||||||
if(TimeUtils.getDayOfWeek()==1&&TimeUtils.getHourOfDay()==5&&TimeUtils.getMiunte()==0){
|
if(TimeUtils.getDayOfWeek()==1&&TimeUtils.getHourOfDay()==0&&TimeUtils.getMiunte()==0){
|
||||||
remove = true;
|
remove = true;
|
||||||
}
|
}
|
||||||
if(remove){
|
if(remove){
|
||||||
|
|
|
@ -21,7 +21,7 @@ public class NewEightActivity extends AbstractActivity {
|
||||||
@Override
|
@Override
|
||||||
boolean takeRewardsProcess(ISession session, SActivityRewardConfig sActivityRewardConfig, ActivityProgressInfo activityProgressInfo) throws Exception {
|
boolean takeRewardsProcess(ISession session, SActivityRewardConfig sActivityRewardConfig, ActivityProgressInfo activityProgressInfo) throws Exception {
|
||||||
User user = UserManager.getUser(session.getUid());
|
User user = UserManager.getUser(session.getUid());
|
||||||
if(TimeUtils.getOverTimeCount(user.getPlayerInfoManager().getCreateTime(),System.currentTimeMillis(),5)<sActivityRewardConfig.getValues()[0][0]-1){
|
if(TimeUtils.getOverTimeCount(user.getPlayerInfoManager().getCreateTime(),System.currentTimeMillis(),0)<sActivityRewardConfig.getValues()[0][0]-1){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -90,12 +90,6 @@ public class MinuteTask extends Thread {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
LOGGER.error("Exception::=>{}",e.toString());
|
LOGGER.error("Exception::=>{}",e.toString());
|
||||||
}
|
}
|
||||||
try {
|
|
||||||
everyFiveTask();
|
|
||||||
}catch (Exception e){
|
|
||||||
e.printStackTrace();
|
|
||||||
LOGGER.error("Exception::=>{}",e.toString());
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
everyMondyFiveClockTask();
|
everyMondyFiveClockTask();
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
|
@ -167,23 +161,7 @@ public class MinuteTask extends Thread {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//弃用
|
|
||||||
// private void fiveMinuteOnlineSend() {
|
|
||||||
// Calendar calendar = Calendar.getInstance();
|
|
||||||
// int minute = calendar.get(Calendar.MINUTE);
|
|
||||||
// if(minute%5 == 0){
|
|
||||||
// KTAppOnline ktAppOnline = new KTAppOnline();
|
|
||||||
// int onlineNum = OnlineUserManager.sessionMap.size();
|
|
||||||
// ParamEventBean paramEventBean = new ParamEventBean(ParamEventBean.OnlineEvent);
|
|
||||||
// int time =(int)(calendar.getTimeInMillis()/1000);
|
|
||||||
// paramEventBean.add(String.valueOf(time));
|
|
||||||
// paramEventBean.add(String.valueOf(onlineNum));
|
|
||||||
// ktAppOnline.setParam_event(paramEventBean);
|
|
||||||
// ktAppOnline.setParam_data(KtBeanBuilderUtils.paramDataBuildForSystem());
|
|
||||||
// ktAppOnline.getParam_data().setCategory_s(LoginParamType.DATA_CATEGORY_APP);
|
|
||||||
// DataMessageUtils.addLogQueue(ktAppOnline);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//每分钟异步上报在线人数
|
//每分钟异步上报在线人数
|
||||||
private void reportUserOnline() {
|
private void reportUserOnline() {
|
||||||
new OnlineUserReportTask().start();
|
new OnlineUserReportTask().start();
|
||||||
|
@ -205,28 +183,17 @@ public class MinuteTask extends Thread {
|
||||||
LOGGER.info("everyHourTask end ...");
|
LOGGER.info("everyHourTask end ...");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//每日凌晨零点执行
|
||||||
public void everyZeroTask() throws Exception {
|
public void everyZeroTask() throws Exception {
|
||||||
Calendar calendar = Calendar.getInstance();
|
Calendar calendar = Calendar.getInstance();
|
||||||
int hour = calendar.get(Calendar.HOUR_OF_DAY);
|
int hour = calendar.get(Calendar.HOUR_OF_DAY);
|
||||||
int minute = calendar.get(Calendar.MINUTE);
|
int minute = calendar.get(Calendar.MINUTE);
|
||||||
if(hour == 0 && minute ==0){
|
if(hour == 0 && minute ==0){
|
||||||
LOGGER.info("DailyOfZeroTask start ...");
|
|
||||||
ArenaLogic.getInstance().sendReward(GlobalsDef.ARENA_DAILY_REWARD);
|
|
||||||
GlobalDataManaager.everTask(0);
|
|
||||||
LOGGER.info("DailyOfZeroTask end ...");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//每日凌晨五点执行
|
|
||||||
public void everyFiveTask() throws Exception {
|
|
||||||
Calendar calendar = Calendar.getInstance();
|
|
||||||
int hour = calendar.get(Calendar.HOUR_OF_DAY);
|
|
||||||
int minute = calendar.get(Calendar.MINUTE);
|
|
||||||
if(hour == 5 && minute ==0){
|
|
||||||
|
|
||||||
//保证每分钟线程
|
//保证每分钟线程
|
||||||
try {
|
try {
|
||||||
|
ArenaLogic.getInstance().sendReward(GlobalsDef.ARENA_DAILY_REWARD);
|
||||||
Map<Integer, GuildInfo> guildInfoMap = GuilidManager.guildInfoMap;
|
Map<Integer, GuildInfo> guildInfoMap = GuilidManager.guildInfoMap;
|
||||||
for(Map.Entry<Integer,GuildInfo> guildInfoEntry:guildInfoMap.entrySet()){
|
for(Map.Entry<Integer,GuildInfo> guildInfoEntry:guildInfoMap.entrySet()){
|
||||||
RedisUtil.getInstence().del(RedisKey.getKey(RedisKey.GUILD_RED_PACKAGE_RANK,String.valueOf(guildInfoEntry.getKey()),false));
|
RedisUtil.getInstence().del(RedisKey.getKey(RedisKey.GUILD_RED_PACKAGE_RANK,String.valueOf(guildInfoEntry.getKey()),false));
|
||||||
|
@ -264,7 +231,7 @@ public class MinuteTask extends Thread {
|
||||||
|
|
||||||
|
|
||||||
LOGGER.info("DailyOfFiveTask start ...");
|
LOGGER.info("DailyOfFiveTask start ...");
|
||||||
GlobalDataManaager.everTask(5);
|
GlobalDataManaager.everTask(0);
|
||||||
LOGGER.info("DailyOfFiveTask end ...");
|
LOGGER.info("DailyOfFiveTask end ...");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue