Commit 0e461c88611b443137962c4d23f620e1f999efdf
1 parent
27cef71d
1.进终点的情况下进起点不重置rfid
Showing
1 changed file
with
6 additions
and
8 deletions
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
| @@ -99,14 +99,6 @@ public class InStationProcess { | @@ -99,14 +99,6 @@ public class InStationProcess { | ||
| 99 | flow = false; | 99 | flow = false; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | - //进起点 rfid状态复位 | ||
| 103 | - if (null != sch && ((sch.getQdzCode().equals(gps.getStopNo()) && gps.getInstation() > 0) || sch.getQdzCode().equals(gps.getCarparkNo()))) { | ||
| 104 | - // 如果是双向线 | ||
| 105 | - if (BasicData.getNbbm2LineMap().get(sch.getClZbh()).getLinePlayType() == 0 && !sch.getQdzCode().equals(sch.getZdzCode())) { | ||
| 106 | - resetRfid(sch); | ||
| 107 | - } | ||
| 108 | - } | ||
| 109 | - | ||
| 110 | boolean isEnd = false; | 102 | boolean isEnd = false; |
| 111 | 103 | ||
| 112 | //进终点 | 104 | //进终点 |
| @@ -116,6 +108,12 @@ public class InStationProcess { | @@ -116,6 +108,12 @@ public class InStationProcess { | ||
| 116 | isEnd = true; | 108 | isEnd = true; |
| 117 | } | 109 | } |
| 118 | 110 | ||
| 111 | + //进起点 rfid状态复位 | ||
| 112 | + if (!isEnd && null != sch && | ||
| 113 | + ((sch.getQdzCode().equals(gps.getStopNo()) && gps.getInstation() > 0) || sch.getQdzCode().equals(gps.getCarparkNo()))) { | ||
| 114 | + resetRfid(sch); | ||
| 115 | + } | ||
| 116 | + | ||
| 119 | GpsCacheData.in(gps, isEnd); | 117 | GpsCacheData.in(gps, isEnd); |
| 120 | } | 118 | } |
| 121 | 119 |