Commit 27cef71dea9cbf02be6a435c04b72fa615887d0a
1 parent
88bbf286
1.环线或双向环线进起点站不重置rfid状态(起点即为终点,所以存在逻辑问题)
Showing
1 changed file
with
5 additions
and
1 deletions
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
| 1 | package com.bsth.data.gpsdata_v2.handlers; | 1 | package com.bsth.data.gpsdata_v2.handlers; |
| 2 | 2 | ||
| 3 | +import com.bsth.data.BasicData; | ||
| 3 | import com.bsth.data.LineConfigData; | 4 | import com.bsth.data.LineConfigData; |
| 4 | import com.bsth.data.gpsdata_v2.cache.GeoCacheData; | 5 | import com.bsth.data.gpsdata_v2.cache.GeoCacheData; |
| 5 | import com.bsth.data.gpsdata_v2.cache.GpsCacheData; | 6 | import com.bsth.data.gpsdata_v2.cache.GpsCacheData; |
| @@ -100,7 +101,10 @@ public class InStationProcess { | @@ -100,7 +101,10 @@ public class InStationProcess { | ||
| 100 | 101 | ||
| 101 | //进起点 rfid状态复位 | 102 | //进起点 rfid状态复位 |
| 102 | if (null != sch && ((sch.getQdzCode().equals(gps.getStopNo()) && gps.getInstation() > 0) || sch.getQdzCode().equals(gps.getCarparkNo()))) { | 103 | if (null != sch && ((sch.getQdzCode().equals(gps.getStopNo()) && gps.getInstation() > 0) || sch.getQdzCode().equals(gps.getCarparkNo()))) { |
| 103 | - resetRfid(sch); | 104 | + // 如果是双向线 |
| 105 | + if (BasicData.getNbbm2LineMap().get(sch.getClZbh()).getLinePlayType() == 0 && !sch.getQdzCode().equals(sch.getZdzCode())) { | ||
| 106 | + resetRfid(sch); | ||
| 107 | + } | ||
| 104 | } | 108 | } |
| 105 | 109 | ||
| 106 | boolean isEnd = false; | 110 | boolean isEnd = false; |