From 23005ce4310a48b3089a209929668dad3e04713d Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Wed, 9 Aug 2023 14:48:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A4=A9=E4=B8=8A=E6=8A=A5=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/thread/ThreadManager.java | 6 +-- .../jieling/thread/task/DataReportTask.java | 35 +++++++-------- .../ljsd/jieling/thread/task/MinuteTask.java | 2 +- .../thread/task/OnlineUserReportTask.java | 45 ++++++++----------- 4 files changed, 39 insertions(+), 49 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java index 39a86cb63..60aeeb96f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java @@ -19,7 +19,7 @@ public class ThreadManager implements IManager { private static final Logger LOGGER = LoggerFactory.getLogger(ThreadManager.class); - private static DataReportTask dataReportTask; +// private static DataReportTask dataReportTask; private static MongoDataHandlerTask mongoDataHandlerTask; private static ItemLogTask itemLogTask; @@ -31,12 +31,12 @@ public class ThreadManager implements IManager { public void init() { mongoDataHandlerTask = ConfigurableApplicationContextManager.getBean(MongoDataHandlerTask.class); - dataReportTask = ConfigurableApplicationContextManager.getBean(DataReportTask.class); +// dataReportTask = ConfigurableApplicationContextManager.getBean(DataReportTask.class); itemLogTask = ConfigurableApplicationContextManager.getBean(ItemLogTask.class); new RetrySendIndicationThread("retry-indi").start(); mongoDataHandlerTask.start(); - dataReportTask.start(); +// dataReportTask.start(); itemLogTask.start(); scheduledExecutor = new ScheduledThreadPoolExecutor(8, new ScheduleThreadFactory()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java index e35b38972..435d1f642 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java @@ -1,8 +1,5 @@ package com.ljsd.jieling.thread.task; -import com.ljsd.jieling.config.reportData.DataMessageUtils; -import com.ljsd.jieling.ktbeans.ReportUserEvent; -import com.ljsd.jieling.ktbeans.ReportUtil; import org.springframework.stereotype.Component; @Component public class DataReportTask extends Thread { @@ -13,21 +10,21 @@ public class DataReportTask extends Thread { } @Override public void run() { - try { - int i = 0; - while(true){ -// ReportUserEvent event = ReportUtil.queue.take(); -// ReportUtil.doReport(event); - - DataMessageUtils.manageData(); - i++; - if (i >= 1000) { - i = 0; - Thread.sleep(100); - } - } - } catch (InterruptedException e) { - e.printStackTrace(); - } +// try { +// int i = 0; +// while(true){ +//// ReportUserEvent event = ReportUtil.queue.take(); +//// ReportUtil.doReport(event); +// +// DataMessageUtils.manageData(); +// i++; +// if (i >= 1000) { +// i = 0; +// Thread.sleep(100); +// } +// } +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index bdb71fccb..6b1efa8ae 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -162,7 +162,7 @@ public class MinuteTask extends Thread { try { GuildFightLogic.minuteCheckForCarFight(); - reportUserOnline(); +// reportUserOnline(); OnlineUserManager.checkOnline(); }catch (Exception e){ e.printStackTrace(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java index 89181e2ae..0317b5e9c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java @@ -1,14 +1,7 @@ package com.ljsd.jieling.thread.task; -import com.ljsd.jieling.config.reportData.DataMessageUtils; -import com.ljsd.jieling.ktbeans.BeanBuilder.KtBeanBuilderUtils; -import com.ljsd.jieling.ktbeans.KTRequestBeans.LoginParamType; -import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; -import com.ljsd.jieling.ktbeans.sendbeans.KTAppOnline; -import com.ljsd.jieling.logic.OnlineUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import util.TimeUtils; /** * @author lvxinran @@ -27,25 +20,25 @@ public class OnlineUserReportTask extends Thread { public void run() { try{ //5分钟上报一次 - if(TimeUtils.getMinute()%5 == 0){ -// int serverId = GameApplication.serverId; -// Set uids = OnlineUserManager.sessionMap.keySet(); -// OnlineUserCalEvent onlineUserCalEvent = new OnlineUserCalEvent(); -// onlineUserCalEvent.setAppid(GameApplication.serverProperties.getAppId()==null?"APPID":GameApplication.serverProperties.getAppId()); -// onlineUserCalEvent.setOnlines(new OnlineProp[]{new OnlineProp(String.valueOf(serverId),uids.size(), TimeUtils.now()/1000)}); -// DataMessageUtils.sendOnlinePost(onlineUserCalEvent); - - KTAppOnline ktAppOnline = new KTAppOnline(); - int onlineNum = OnlineUserManager.sessionMap.size(); - ParamEventBean paramEventBean = new ParamEventBean(ParamEventBean.OnlineEvent); - long time = TimeUtils.now()/ 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); - } +// if(TimeUtils.getMinute()%5 == 0){ +//// int serverId = GameApplication.serverId; +//// Set uids = OnlineUserManager.sessionMap.keySet(); +//// OnlineUserCalEvent onlineUserCalEvent = new OnlineUserCalEvent(); +//// onlineUserCalEvent.setAppid(GameApplication.serverProperties.getAppId()==null?"APPID":GameApplication.serverProperties.getAppId()); +//// onlineUserCalEvent.setOnlines(new OnlineProp[]{new OnlineProp(String.valueOf(serverId),uids.size(), TimeUtils.now()/1000)}); +//// DataMessageUtils.sendOnlinePost(onlineUserCalEvent); +// +// KTAppOnline ktAppOnline = new KTAppOnline(); +// int onlineNum = OnlineUserManager.sessionMap.size(); +// ParamEventBean paramEventBean = new ParamEventBean(ParamEventBean.OnlineEvent); +// long time = TimeUtils.now()/ 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); +// } // Set uids = OnlineUserManager.sessionMap.keySet(); // Map channelMap = new HashMap<>();