潘钊 / bsth_control · Commits

Commit 8dff7fa1c7609b007454f18f91d0dacc4d8f880e

Authored by 潘钊
1 parent 34ca053f

update...

Inline Side-by-side
Showing 3 changed files with 4 additions and 3 deletions
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
  View file @8dff7fa
... ... @@ -90,7 +90,8 @@ public class InStationProcess {
90 90 boolean isEnd = false;
91 91  
92 92 //进终点
93   - if (flow && null != sch && sch.getZdzCode().equals(gps.getStopNo())) {
  93 + if (flow && null != sch &&
  94 + ((sch.getZdzCode().equals(gps.getStopNo()) && gps.getInstation()>0) || sch.getZdzCode().equals(gps.getCarparkNo()))) {
94 95 inEndStation(sch, gps);
95 96 isEnd = true;
96 97 }
... ...
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
  View file @8dff7fa
... ... @@ -70,7 +70,7 @@ public class OutStationProcess {
70 70  
71 71 //起点发车
72 72 if (null != sch &&
73   - (sch.getQdzCode().equals(prev.getStopNo()) || sch.getQdzCode().equals(prev.getCarparkNo()))){
  73 + ((sch.getQdzCode().equals(prev.getStopNo()) && gps.getInstation()==0) || sch.getQdzCode().equals(prev.getCarparkNo()))){
74 74 //发车班次匹配
75 75 if(!signalSchPlanMatcher.outMatch(gps, sch)){
76 76 outStation(gps, prev);
... ...
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
  View file @8dff7fa
... ... @@ -98,7 +98,7 @@ public class SchAttrCalculator {
98 98  
99 99 // 计划终点时间
100 100 if (sch.getBcsj() != null) {
101   - sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
  101 + sch.setZdsjT(sch.getFcsjT() + (sch.getBcsj() * 60 * 1000));
102 102 sch.setZdsj(fmtHHmm.print(sch.getZdsjT()));
103 103 }
104 104 } catch (ParseException e) {
... ...