潘钊 / bsth_control · Commits

Commit 0743fc80cdfec922bcd3d937c2b2268f85e4e91d

Authored by 潘钊
1 parent 0120b0e5
build: skipped

update..

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
src/main/java/com/bsth/data/gpsdata/status_manager/gps_line_state/LineStateHandle.java
  View file @0743fc8
@@ -31,7 +31,7 @@ public class LineStateHandle { @@ -31,7 +31,7 @@ public class LineStateHandle {
31 /** 重发次数 */ 31 /** 重发次数 */
32 private final static int MAX_SEND_COUNT=3; 32 private final static int MAX_SEND_COUNT=3;
33 /** 重发间隔 */ 33 /** 重发间隔 */
34 - private final static int SEND_SPACE=1000 * 60 * 5; 34 + private final static int SEND_SPACE=1000 * 60 * 4;
35 /** 最大有效时间 */ 35 /** 最大有效时间 */
36 private final static int MAX_AVAIL_TIME=1000 * 60 * 60 * 2; 36 private final static int MAX_AVAIL_TIME=1000 * 60 * 60 * 2;
37 37
src/main/java/com/bsth/data/gpsdata/status_manager/gps_service_state/ServiceStateHandle.java
  View file @0743fc8
@@ -13,7 +13,7 @@ import java.util.Collection; @@ -13,7 +13,7 @@ import java.util.Collection;
13 import java.util.concurrent.ConcurrentHashMap; 13 import java.util.concurrent.ConcurrentHashMap;
14 14
15 /** 15 /**
16 - * 设备营运状态处理 16 + * 设备营运状态/上下行 处理
17 * Created by panzhao on 2017/7/13. 17 * Created by panzhao on 2017/7/13.
18 */ 18 */
19 @Component 19 @Component
@@ -31,9 +31,9 @@ public class ServiceStateHandle { @@ -31,9 +31,9 @@ public class ServiceStateHandle {
31 /** 重发次数 */ 31 /** 重发次数 */
32 private final static int MAX_SEND_COUNT=3; 32 private final static int MAX_SEND_COUNT=3;
33 /** 重发间隔 */ 33 /** 重发间隔 */
34 - private final static int SEND_SPACE=1000 * 60 * 4; 34 + private final static int SEND_SPACE=1000 * 60 * 3;
35 /** 最大有效时间 */ 35 /** 最大有效时间 */
36 - private final static int MAX_AVAIL_TIME=1000 * 60 * 60; 36 + private final static int MAX_AVAIL_TIME=1000 * 60 * 50;
37 37
38 static{ 38 static{
39 map = new ConcurrentHashMap(); 39 map = new ConcurrentHashMap();
@@ -67,9 +67,9 @@ public class ServiceStateHandle { @@ -67,9 +67,9 @@ public class ServiceStateHandle {
67 if(gps == null) 67 if(gps == null)
68 return; 68 return;
69 69
70 - if(gps.getState().equals(sb.getState())){ 70 + if(gps.getState().equals(sb.getState()) && gps.getUpDown() == sb.getUpDown()){
71 map.remove(sb.getNbbm()); 71 map.remove(sb.getNbbm());
72 - logger.info("营运状态切换成功，" + sb.getNbbm() + "、" + sb.getState()); 72 + logger.info("状态切换成功，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getUpDown());
73 } 73 }
74 else 74 else
75 reSend(sb); 75 reSend(sb);
@@ -88,14 +88,14 @@ public class ServiceStateHandle { @@ -88,14 +88,14 @@ public class ServiceStateHandle {
88 long diff = System.currentTimeMillis() - sb.getSt(); 88 long diff = System.currentTimeMillis() - sb.getSt();
89 if(diff >= MAX_AVAIL_TIME){ 89 if(diff >= MAX_AVAIL_TIME){
90 map.remove(sb.getNbbm()); 90 map.remove(sb.getNbbm());
91 - logger.info("营运状态切换超过有效时间，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getSt()); 91 + logger.info("状态切换超过有效时间，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getSt());
92 return; 92 return;
93 } 93 }
94 94
95 if(diff >= SEND_SPACE){ 95 if(diff >= SEND_SPACE){
96 sb.setSender("补发@系统"); 96 sb.setSender("补发@系统");
97 changeState(sb); 97 changeState(sb);
98 - logger.info("重发营运状态切换指令，" + sb.getNbbm() + "、" + sb.getState()); 98 + logger.info("重发状态切换指令，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getUpDown());
99 return; 99 return;
100 } 100 }
101 } 101 }