潘钊 / bsth_control · Commits

Commit 1f9c76a2184930429d0936b0e1f07352dad79092

Authored by 潘钊
1 parent 2d3c0cc0

update...

Inline Side-by-side
Showing 2 changed files with 10 additions and 5 deletions
src/main/java/com/bsth/data/gpsdata_v2/handlers/GpsStateProcess.java
  View file @1f9c76a
... ... @@ -27,16 +27,16 @@ public class GpsStateProcess {
27 27 if (null == sch)
28 28 return;
29 29  
30   - byte upDown = Byte.parseByte(sch.getXlDir());
  30 + int upDown = Integer.parseInt(sch.getXlDir());
31 31 int schState = dayOfSchedule.emptyService(sch)?1:0;
32 32  
33   - if(gps.getState() != schState || gps.getUpDown() != upDown){
  33 + if(gps.getState().intValue() != schState || gps.getUpDown().intValue() != upDown){
34 34 //下发指令纠正车载的 营运状态 和 走向
35 35 gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, schState, "同步@系统");
36 36 }
37 37  
38 38 if (gps.getUpDown() != upDown) {
39   - gps.setUpDown(upDown);//修正走向
  39 + gps.setUpDown((byte) upDown);//修正走向
40 40 }
41 41  
42 42 if (!sch.getXlBm().equals(gps.getLineId())) {
... ...
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
  View file @1f9c76a
... ... @@ -176,8 +176,13 @@ public class InStationProcess {
176 176 if(null == next && gps.isService()){
177 177 nonService(sch, "结束@系统");//营运结束
178 178 }
179   - //下发运营指令
180   - DirectivePushQueue.put6003(next, "到站@系统");
  179 +
  180 + /**
  181 + * 下一班不是全程班次的时候，下发运营指令
  182 + * 全程班次时，由网关根据进出起终点，自动切换走向
  183 + */
  184 + if(null != next && !next.getBcType().equals("normal"))
  185 + DirectivePushQueue.put6003(next, "到站@系统");
181 186  
182 187 //下发调度指令
183 188 DirectivePushQueue.put6002(next, doneSum, "到站@系统", "");
... ...