root/ifishSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备离线信息保存,日志打印

Browse Source
This commit is contained in:
yiyan
2019-05-14 22:53:11 +08:00
parent 84cc865b17
commit b32745c772
7 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ifish/entity/hbm/DeviceOffline.hbm.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<property name="offlineMacAddress" column="offline_mac_address" type="string" length="50"/>
<property name="offlineFactoryCode" column="offline_factory_code" type="string" length="10"/>
<property name="offlineDeviceType" column="offline_device_type" type="string" length="10"/>
<property name="offlineTime" column="offline_time" type="date" />
<property name="offlineTime" column="offline_time" type="timestamp" />
<property name="offlineSdkVersion" column="offline_sdk_version" type="string" length="20"/>
</class>
</hibernate-mapping>
src/main/java/com/ifish/quartz/ExecuteJob.java
+16 -19
View File
@@ -1,21 +1,6 @@
package com.ifish.quartz;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ifish.entity.*;
import com.ifish.util.IfishUtil;
import org.apache.mina.core.session.IoSession;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.ifish.enums.BooleanEnum;
import com.ifish.enums.NeteaseEnum;
import com.ifish.enums.PushTypeEnum;
@@ -23,10 +8,23 @@ import com.ifish.netease.NeteaseIM;
import com.ifish.service.DeviceService;
import com.ifish.service.UserService;
import com.ifish.socketNew.SomeServer;
import com.ifish.util.IfishUtil;
import org.apache.log4j.Logger;
import org.apache.mina.core.session.IoSession;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ExecuteJob implements Job {
private static Logger log = LoggerFactory.getLogger(ExecuteJob.class);
private static Logger log = Logger.getLogger(ExecuteJob.class);
@Autowired
private NeteaseIM neteaseIM;
@Autowired
@@ -56,7 +54,7 @@ public class ExecuteJob implements Job {
deviceOffline.setOfflineSdkVersion(String.valueOf(device.getSdkVersion()));
deviceOffline.setOfflineTime(IfishUtil.StrToDate1(timestamp));
deviceService.saveDeviceOffline(deviceOffline);
log.info("离线设备信息保存++++++++++++++++++++++++++++++++++++++++++");
//记录次数
Integer number1 = device.getNumber1();
Integer number2 = device.getNumber2();
@@ -113,8 +111,7 @@ public class ExecuteJob implements Job {
}
}
} catch (Exception e) {
e.printStackTrace();
log.error("error msg:{}",e.toString());
log.error(e.getMessage(),e);
}
}
}
src/main/java/com/ifish/socketNew/MinaServerHandler.java
+14 -15
View File
@@ -1,18 +1,16 @@
package com.ifish.socketNew;
import java.util.Date;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.ifish.quartz.JobGroup;
import com.ifish.quartz.ScheduleJob;
import com.ifish.util.IfishUtil;
import org.apache.log4j.Logger;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
import java.util.concurrent.atomic.AtomicInteger;
/**
* mina服务器端事件处理
@@ -23,7 +21,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
private final AtomicInteger atomicInt = new AtomicInteger();
private static Logger log = LoggerFactory.getLogger(MinaServerHandler.class);
private static Logger log = Logger.getLogger(MinaServerHandler.class);
@Autowired
private SomeServer someServer;
@@ -33,7 +31,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
@Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
cause.printStackTrace();
log.error("{}服务器-客户端session异常:{}", session.getRemoteAddress(), cause.toString());
log.error(String.format("{%s}服务器-客户端session异常:", session.getRemoteAddress()), cause);
}
/**
@@ -49,7 +47,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
*/
@Override
public void sessionCreated(IoSession session) throws Exception {
log.info("{}:会话创建,在线数:{}", session.getRemoteAddress(), atomicInt.incrementAndGet());
log.info(String.format("{%s}:会话创建,在线数:{%s}", session.getRemoteAddress(), atomicInt.incrementAndGet()));
}
/**
@@ -57,7 +55,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
*/
@Override
public void sessionClosed(IoSession session) throws Exception {
log.info("{}:会话关闭,连接数:{}", session.getRemoteAddress(), atomicInt.decrementAndGet());
log.info(String.format("{%s}:会话关闭在线数:{%s}", session.getRemoteAddress(), atomicInt.incrementAndGet()));
//旧连接关闭,获取设备mac地址
String oldConnect = session.getRemoteAddress().toString();
String macAddress = SomeServer.remoteAddress.get(oldConnect);
@@ -93,6 +91,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
jobGroup.setTimestamp(IfishUtil.format(new Date()));
//10分钟后推送 update 30分钟
jobGroup.setStartTime(new Date(System.currentTimeMillis() + 600000L * 3));
// jobGroup.setStartTime(new Date(System.currentTimeMillis() + 6000));
scheduleJob.addJob(jobGroup);
}
@@ -110,7 +109,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
@Override
public void sessionIdle(IoSession session, IdleStatus status)
throws Exception {
log.info("空闲超时，服务器主动关闭连接{}", session.getRemoteAddress());
log.info(String.format("空闲超时，服务器主动关闭连接{%s}", session.getRemoteAddress()));
session.close(true);
}