Commit 7476b8e63f77dcf6d731cc8203d1a45fdc20f6d2
1 parent
c4e0f3d2
update...
Showing
4 changed files
with
6 additions
and
11 deletions
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
| @@ -110,8 +110,6 @@ public class DataHandleProcess { | @@ -110,8 +110,6 @@ public class DataHandleProcess { | ||
| 110 | logger.error("", e); | 110 | logger.error("", e); |
| 111 | } | 111 | } |
| 112 | } | 112 | } |
| 113 | - } catch (Exception e) { | ||
| 114 | - //logger.error("", e); | ||
| 115 | } finally { | 113 | } finally { |
| 116 | if (count != null) | 114 | if (count != null) |
| 117 | count.countDown(); | 115 | count.countDown(); |
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
| @@ -61,12 +61,13 @@ public class InStationProcess { | @@ -61,12 +61,13 @@ public class InStationProcess { | ||
| 61 | * @param prev | 61 | * @param prev |
| 62 | */ | 62 | */ |
| 63 | private void inStation(GpsEntity gps, GpsEntity prev){ | 63 | private void inStation(GpsEntity gps, GpsEntity prev){ |
| 64 | + boolean flow=true; | ||
| 64 | //要经过一个中途站才能进 | 65 | //要经过一个中途站才能进 |
| 65 | StationRoute s = GpsCacheData.prevStation(gps); | 66 | StationRoute s = GpsCacheData.prevStation(gps); |
| 66 | List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown()); | 67 | List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown()); |
| 67 | if(routes.size() > 3 && null != s && s.getName().equals(gps.getStation().getName())){ | 68 | if(routes.size() > 3 && null != s && s.getName().equals(gps.getStation().getName())){ |
| 68 | - logger.info("没有进中途站，拒绝进场... -" + gps.getNbbm() + " -time:" + gps.getTimestamp()); | ||
| 69 | - return; | 69 | + logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp()); |
| 70 | + flow = false; | ||
| 70 | } | 71 | } |
| 71 | 72 | ||
| 72 | 73 | ||
| @@ -74,7 +75,7 @@ public class InStationProcess { | @@ -74,7 +75,7 @@ public class InStationProcess { | ||
| 74 | boolean isEnd=false; | 75 | boolean isEnd=false; |
| 75 | 76 | ||
| 76 | //进终点 | 77 | //进终点 |
| 77 | - if(null != sch && sch.getZdzCode().equals(gps.getStopNo())){ | 78 | + if(flow && null != sch && sch.getZdzCode().equals(gps.getStopNo())){ |
| 78 | inEndStation(sch, gps); | 79 | inEndStation(sch, gps); |
| 79 | isEnd = true; | 80 | isEnd = true; |
| 80 | } | 81 | } |
src/main/java/com/bsth/data/gpsdata_v2/handlers/ReverseRouteProcess.java
| @@ -48,7 +48,7 @@ public class ReverseRouteProcess { | @@ -48,7 +48,7 @@ public class ReverseRouteProcess { | ||
| 48 | int sortNo = gps.getStation().getRouteSort(); | 48 | int sortNo = gps.getStation().getRouteSort(); |
| 49 | StationRoute prev = GpsCacheData.prevStation(gps); | 49 | StationRoute prev = GpsCacheData.prevStation(gps); |
| 50 | //和上一个站点是反向 | 50 | //和上一个站点是反向 |
| 51 | - if(sortNo < prev.getRouteSort()){ | 51 | + if(null != prev && sortNo < prev.getRouteSort()){ |
| 52 | 52 | ||
| 53 | //满足3个进站反向信号 | 53 | //满足3个进站反向信号 |
| 54 | List<StationRoute> prevs = GpsCacheData.prevMultiStation(gps); | 54 | List<StationRoute> prevs = GpsCacheData.prevMultiStation(gps); |
src/main/resources/logback.xml
| @@ -177,11 +177,7 @@ | @@ -177,11 +177,7 @@ | ||
| 177 | </pattern> | 177 | </pattern> |
| 178 | </layout> | 178 | </layout> |
| 179 | </appender> | 179 | </appender> |
| 180 | - <logger name="com.bsth.data.gpsdata.thread.GpsDataLoaderThread" | ||
| 181 | - level="INFO" additivity="false"> | ||
| 182 | - <appender-ref ref="GPS_COUNT" /> | ||
| 183 | - </logger> | ||
| 184 | - <logger name="com.bsth.data.gpsdata.arrival.GpsRealAnalyse" | 180 | + <logger name="com.bsth.data.gpsdata_v2" |
| 185 | level="INFO" additivity="false"> | 181 | level="INFO" additivity="false"> |
| 186 | <appender-ref ref="GPS_COUNT" /> | 182 | <appender-ref ref="GPS_COUNT" /> |
| 187 | </logger> | 183 | </logger> |