潘钊 / control_gps_client · Commits

Commit 0d4cbfc417fed34cb1c35b853231651023c64726

Authored by 潘钊
1 parent c0b2aad0

停掉转发..

Inline Side-by-side
Showing 2 changed files with 4 additions and 5 deletions
src/main/java/com/bsth/client/ClientApp.java
  View file @0d4cbfc
@@ -3,7 +3,6 @@ package com.bsth.client; @@ -3,7 +3,6 @@ package com.bsth.client;
3 import com.bsth.client.pd.codec.PdMessageCodecFactory; 3 import com.bsth.client.pd.codec.PdMessageCodecFactory;
4 import com.bsth.client.pd.handler.PdClientHandler; 4 import com.bsth.client.pd.handler.PdClientHandler;
5 import com.bsth.client.pd.protocol.Pd_31_0; 5 import com.bsth.client.pd.protocol.Pd_31_0;
6 -import com.bsth.client.pf.codec.PfMessageCodecFactory;  
7 import com.bsth.client.pf.handler.PfClientHandler; 6 import com.bsth.client.pf.handler.PfClientHandler;
8 import com.bsth.util.ConfigUtil; 7 import com.bsth.util.ConfigUtil;
9 import org.apache.mina.core.future.ConnectFuture; 8 import org.apache.mina.core.future.ConnectFuture;
@@ -189,7 +188,7 @@ public class ClientApp implements CommandLineRunner{ @@ -189,7 +188,7 @@ public class ClientApp implements CommandLineRunner{
189 pdDataConnector.setHandler(pdClient); 188 pdDataConnector.setHandler(pdClient);
190 189
191 pdconnect(ConfigUtil.get("forward.device.name")); 190 pdconnect(ConfigUtil.get("forward.device.name"));
192 - /*******************************浦东转发********************************/ 191 + /*******************************浦东转发*******************************
193 pfDataConnector = new NioSocketConnector(); 192 pfDataConnector = new NioSocketConnector();
194 193
195 LoggingFilter log1 = new LoggingFilter(); 194 LoggingFilter log1 = new LoggingFilter();
@@ -208,7 +207,7 @@ public class ClientApp implements CommandLineRunner{ @@ -208,7 +207,7 @@ public class ClientApp implements CommandLineRunner{
208 config1.setIdleTime(IdleStatus.BOTH_IDLE, 60); 207 config1.setIdleTime(IdleStatus.BOTH_IDLE, 60);
209 208
210 pfDataConnector.setHandler(pfClient); 209 pfDataConnector.setHandler(pfClient);
211 - pfconnect(ConfigUtil.get("forward.device.name")); 210 + pfconnect(ConfigUtil.get("forward.device.name"));*/
212 } 211 }
213 212
214 213
src/main/java/com/bsth/entity/GpsEntity.java
  View file @0d4cbfc
@@ -81,9 +81,9 @@ public class GpsEntity { @@ -81,9 +81,9 @@ public class GpsEntity {
81 public static GpsEntity getInstance(BasicInfo basicInfo, int version, int source){ 81 public static GpsEntity getInstance(BasicInfo basicInfo, int version, int source){
82 if(StringUtils.isBlank(basicInfo.getDeviceId())) 82 if(StringUtils.isBlank(basicInfo.getDeviceId()))
83 return null; 83 return null;
84 - //接受 5 分钟内的补传数据 84 + //接受 10 分钟内的补传数据
85 byte cacheData = getCacheState(basicInfo.getServiceState()); 85 byte cacheData = getCacheState(basicInfo.getServiceState());
86 - if(cacheData == 1 && Math.abs(basicInfo.getTimestamp() - System.currentTimeMillis()) > 1000 * 60 * 5) 86 + if(cacheData == 1 && Math.abs(basicInfo.getTimestamp() - System.currentTimeMillis()) > 1000 * 60 * 10)
87 return null; 87 return null;
88 88
89 GpsEntity gps = new GpsEntity(); 89 GpsEntity gps = new GpsEntity();