Commit 0456d09651ed9e3a017653b0187baba22618a5bd

Authored by 潘钊
1 parent 84e190ba

update...

src/main/java/com/bsth/data/ThreadMonotor.java
@@ -18,7 +18,7 @@ public class ThreadMonotor extends Thread{ @@ -18,7 +18,7 @@ public class ThreadMonotor extends Thread{
18 @Override 18 @Override
19 public void run() { 19 public void run() {
20 20
21 - //线调GPS分析线程 21 + //线调GPS分析线程
22 if(GpsRealAnalyse.isBlock()){ 22 if(GpsRealAnalyse.isBlock()){
23 log.warn("GpsRealAnalyse isBlock true !!!!"); 23 log.warn("GpsRealAnalyse isBlock true !!!!");
24 GpsRealAnalyse.shutdown(); 24 GpsRealAnalyse.shutdown();
@@ -30,7 +30,7 @@ public class ThreadMonotor extends Thread{ @@ -30,7 +30,7 @@ public class ThreadMonotor extends Thread{
30 WebSocketPushQueue.start(); 30 WebSocketPushQueue.start();
31 } 31 }
32 32
33 - //系统自动发送的网关指令 推送队列 33 + //网关指令推送队列(系统自动发送的)
34 if(DirectivePushQueue.isIdle()){ 34 if(DirectivePushQueue.isIdle()){
35 log.warn("DirectivePushQueue isIdle true !!!!"); 35 log.warn("DirectivePushQueue isIdle true !!!!");
36 DirectivePushQueue.start(); 36 DirectivePushQueue.start();
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
@@ -88,6 +88,13 @@ public class GpsEntity { @@ -88,6 +88,13 @@ public class GpsEntity {
88 /** gps是否有效 设备端发送的状态 */ 88 /** gps是否有效 设备端发送的状态 */
89 private int valid; 89 private int valid;
90 90
  91 + /**
  92 + * 数据来源
  93 + * 1:网关
  94 + * 0:转发
  95 + */
  96 + private int source;
  97 +
91 public String getDeviceId() { 98 public String getDeviceId() {
92 return deviceId; 99 return deviceId;
93 } 100 }
@@ -292,4 +299,12 @@ public class GpsEntity { @@ -292,4 +299,12 @@ public class GpsEntity {
292 public void setSpeed(Float speed) { 299 public void setSpeed(Float speed) {
293 this.speed = speed; 300 this.speed = speed;
294 } 301 }
  302 +
  303 + public int getSource() {
  304 + return source;
  305 + }
  306 +
  307 + public void setSource(int source) {
  308 + this.source = source;
  309 + }
295 } 310 }